checkasm: test zigzag_sub_8x8_{frame,field}

[x264] / output / flv_bytestream.c

diff --git a/output/flv_bytestream.c b/output/flv_bytestream.c
index 316114c8b8dbc4b369070bec40d48bd1abdee4d1..2e7e861534b890e6d155f51d06b5018ae5b88ebd 100644 (file)
--- a/output/flv_bytestream.c
+++ b/output/flv_bytestream.c
@@ -1,7 +1,9 @@
 /*****************************************************************************
- * flv_bytestream.c:
+ * flv_bytestream.c: flv muxer utilities
  *****************************************************************************
- * Copyright (C) 2009 Kieran Kunhya
+ * Copyright (C) 2009-2014 x264 project
+ *
+ * Authors: Kieran Kunhya <kieran@kunhya.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,82 +18,83 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111, USA.
+ *
+ * This program is also available under a commercial proprietary license.
+ * For more information, contact us at licensing@x264.com.
  *****************************************************************************/
 
-#include "muxers.h"
+#include "output.h"
 #include "flv_bytestream.h"
 
-uint64_t dbl2int( double value )
+uint64_t flv_dbl2int( double value )
 {
     return (union {double f; uint64_t i;}){value}.i;
 }
 
 /* Put functions  */
 
-void x264_put_byte( flv_buffer *c, uint8_t b )
+void flv_put_byte( flv_buffer *c, uint8_t b )
 {
     flv_append_data( c, &b, 1 );
 }
 
-void x264_put_be32( flv_buffer *c, uint32_t val )
+void flv_put_be32( flv_buffer *c, uint32_t val )
 {
-    x264_put_byte( c, val >> 24 );
-    x264_put_byte( c, val >> 16 );
-    x264_put_byte( c, val >> 8 );
-    x264_put_byte( c, val );
+    flv_put_byte( c, val >> 24 );
+    flv_put_byte( c, val >> 16 );
+    flv_put_byte( c, val >> 8 );
+    flv_put_byte( c, val );
 }
 
-void x264_put_be64( flv_buffer *c, uint64_t val )
+void flv_put_be64( flv_buffer *c, uint64_t val )
 {
-    x264_put_be32( c, val >> 32 );
-    x264_put_be32( c, val );
+    flv_put_be32( c, val >> 32 );
+    flv_put_be32( c, val );
 }
 
-void x264_put_be16( flv_buffer *c, uint16_t val )
+void flv_put_be16( flv_buffer *c, uint16_t val )
 {
-    x264_put_byte( c, val >> 8 );
-    x264_put_byte( c, val );
+    flv_put_byte( c, val >> 8 );
+    flv_put_byte( c, val );
 }
 
-void x264_put_be24( flv_buffer *c, uint32_t val )
+void flv_put_be24( flv_buffer *c, uint32_t val )
 {
-    x264_put_be16( c, val >> 8 );
-    x264_put_byte( c, val );
+    flv_put_be16( c, val >> 8 );
+    flv_put_byte( c, val );
 }
 
-void x264_put_tag( flv_buffer *c, const char *tag )
+void flv_put_tag( flv_buffer *c, const char *tag )
 {
     while( *tag )
-        x264_put_byte( c, *tag++ );
+        flv_put_byte( c, *tag++ );
 }
 
-void x264_put_amf_string( flv_buffer *c, const char *str )
+void flv_put_amf_string( flv_buffer *c, const char *str )
 {
     uint16_t len = strlen( str );
-    x264_put_be16( c, len );
+    flv_put_be16( c, len );
     flv_append_data( c, (uint8_t*)str, len );
 }
 
-void x264_put_amf_double( flv_buffer *c, double d )
+void flv_put_amf_double( flv_buffer *c, double d )
 {
-    x264_put_byte( c, AMF_DATA_TYPE_NUMBER );
-    x264_put_be64( c, dbl2int( d ) );
+    flv_put_byte( c, AMF_DATA_TYPE_NUMBER );
+    flv_put_be64( c, flv_dbl2int( d ) );
 }
 
 /* flv writing functions */
 
 flv_buffer *flv_create_writer( const char *filename )
 {
-    flv_buffer *c = malloc( sizeof(*c) );
-
+    flv_buffer *c = calloc( 1, sizeof(flv_buffer) );
     if( !c )
         return NULL;
-    memset( c, 0, sizeof(*c) );
 
     if( !strcmp( filename, "-" ) )
         c->fp = stdout;
     else
-        c->fp = fopen( filename, "wb" );
+        c->fp = x264_fopen( filename, "wb" );
     if( !c->fp )
     {
         free( c );
@@ -127,7 +130,7 @@ int flv_append_data( flv_buffer *c, uint8_t *data, unsigned size )
     return 0;
 }
 
-void rewrite_amf_be24( flv_buffer *c, unsigned length, unsigned start )
+void flv_rewrite_amf_be24( flv_buffer *c, unsigned length, unsigned start )
 {
      *(c->data + start + 0) = length >> 16;
      *(c->data + start + 1) = length >> 8;