Mercurial > mplayer.hg

changeset 5617:75a43bb3ed80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added big endian handling for the ASF_chunk_t struct. (reworked of the patch from Guillaume Morin <guillaume@morinfr.org>)
author bertrand
date Sun, 14 Apr 2002 05:51:32 +0000
parents 8cfce21c6013
children f02b9bec4eed
files libmpdemux/asf_streaming.c
diffstat 1 files changed, 11 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/asf_streaming.c	Sun Apr 14 05:47:27 2002 +0000
+++ b/libmpdemux/asf_streaming.c	Sun Apr 14 05:51:32 2002 +0000
@@ -101,20 +101,20 @@
 	printf("  size_confirm: 0x%02X\n", stream_chunck->size_confirm );
 */
 	switch(stream_chunck->type) {
-		case 0x4324:	// $C	Clear ASF configuration
+		case ASF_STREAMING_CLEAR:	// $C	Clear ASF configuration
 			printf("=====> Clearing ASF stream configuration!\n");
 			if( drop_packet!=NULL ) *drop_packet = 1;
 			return stream_chunck->size;
 			break;
-		case 0x4424:    // $D	Data follows
+		case ASF_STREAMING_DATA:	// $D	Data follows
 //			printf("=====> Data follows\n");
 			break;
-		case 0x4524:    // $E	Transfer complete
+		case ASF_STREAMING_END_TRANS:	// $E	Transfer complete
 			printf("=====> Transfer complete\n");
 			if( drop_packet!=NULL ) *drop_packet = 1;
 			return stream_chunck->size;
 			break;
-		case 0x4824:    // $H	ASF header chunk follows
+		case ASF_STREAMING_HEADER:	// $H	ASF header chunk follows
 			printf("=====> ASF header chunk follows\n");
 			break;
 		default:
@@ -147,13 +147,15 @@
 		if(i <= 0) return -1;
 		r += i;
 	  }
+	  // Endian handling of the stream chunk
+	  le2me_ASF_stream_chunck_t(&chunk);
 	  size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
 	  if(r) printf("Warning : drop header ????\n");
 	  if(size < 0){
 	    printf("Error while parsing chunk header\n");
 		return -1;
 	  }
-	  if (chunk.type != 0x4824) {
+	  if (chunk.type != ASF_STREAMING_HEADER) {
 	    printf("Don't got a header as first chunk !!!!\n");
 	    return -1;
 	  }
@@ -283,6 +285,9 @@
 	}
 	read += r;
       }
+      
+      // Endian handling of the stream chunk
+      le2me_ASF_stream_chunck_t(&chunk);
       chunk_size = asf_streaming( &chunk, &drop_chunk );
       if(chunk_size < 0) {
 	printf("Error while parsing chunk header\n");
@@ -290,7 +295,7 @@
       }
       chunk_size -= sizeof(ASF_stream_chunck_t);
 	
-      if(chunk.type != 0x4824 && (!drop_chunk)) {
+      if(chunk.type != ASF_STREAMING_HEADER && (!drop_chunk)) {
 	if (asf_http_ctrl->packet_size < chunk_size) {
 	  printf("Error chunk_size > packet_size\n");
 	  return -1;