Make url_split() strip url options (?opt=var) from the returned hostname or

[ffmpeg] / libavformat / nutenc.c

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 42d861f0d8371e1bc30daada6e90a33cfd164c5e..b28566100cc2779b2f31cf83688d3b2911161f0f 100644 (file)
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -22,8 +22,6 @@
 #include "nut.h"
 #include "tree.h"
 
-#define TRACE
-
 static void build_frame_code(AVFormatContext *s){
     NUTContext *nut = s->priv_data;
     int key_frame, index, pred, stream_id;
@@ -162,7 +160,7 @@ static void put_t(NUTContext *nut, StreamContext *nus, ByteIOContext *bc, uint64
 }
 
 /**
- * stores a string as vb.
+ * Stores a string as vb.
  */
 static void put_str(ByteIOContext *bc, const char *string){
     int len= strlen(string);
@@ -216,7 +214,7 @@ static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc
 static void write_mainheader(NUTContext *nut, ByteIOContext *bc){
     int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields;
 
-    put_v(bc, 2); /* version */
+    put_v(bc, 3); /* version */
     put_v(bc, nut->avf->nb_streams);
     put_v(bc, MAX_DISTANCE);
     put_v(bc, nut->time_base_count);
@@ -303,8 +301,14 @@ static int write_streamheader(NUTContext *nut, ByteIOContext *bc, AVCodecContext
     case CODEC_TYPE_VIDEO:
         put_v(bc, codec->width);
         put_v(bc, codec->height);
-        put_v(bc, codec->sample_aspect_ratio.num);
-        put_v(bc, codec->sample_aspect_ratio.den);
+
+        if(codec->sample_aspect_ratio.num<=0 || codec->sample_aspect_ratio.den<=0){
+            put_v(bc, 0);
+            put_v(bc, 0);
+        }else{
+            put_v(bc, codec->sample_aspect_ratio.num);
+            put_v(bc, codec->sample_aspect_ratio.den);
+        }
         put_v(bc, 0); /* csp type -- unknown */
         break;
     default:
@@ -365,6 +369,9 @@ static void write_headers(NUTContext *nut, ByteIOContext *bc){
     url_open_dyn_buf(&dyn_bc);
     write_globalinfo(nut, &dyn_bc);
     put_packet(nut, bc, &dyn_bc, 1, INFO_STARTCODE);
+
+    nut->last_syncpoint_pos= INT_MIN;
+    nut->header_count++;
 }
 
 static int write_header(AVFormatContext *s){
@@ -372,10 +379,6 @@ static int write_header(AVFormatContext *s){
     ByteIOContext *bc = &s->pb;
     int i, j;
 
-    if(s->streams[0]->codec->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL){
-        return -1;
-    }
-
     nut->avf= s;
 
     nut->stream   = av_mallocz(sizeof(StreamContext)*s->nb_streams);
@@ -416,7 +419,7 @@ static int write_header(AVFormatContext *s){
 
     put_flush_packet(bc);
 
-    //FIXME header repeation, index
+    //FIXME index
 
     return 0;
 }
@@ -432,7 +435,7 @@ static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc,
     if(FFABS(pkt->pts - nus->last_pts)
                          > nus->max_pts_distance) flags |= FLAG_CHECKSUM;
 
-    return flags;
+    return flags | (fc->flags & FLAG_CODED);
 }
 
 static int write_packet(AVFormatContext *s, AVPacket *pkt){
@@ -445,13 +448,16 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
     int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
     int store_sp=0;
 
+    if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
+        write_headers(nut, bc);
+
     if(key_frame && !!(nus->last_flags & FLAG_KEY))
         store_sp= 1;
 
     if(pkt->size + 30/*FIXME check*/ + url_ftell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
         store_sp= 1;
 
-//FIXME ensure store_sp is 1 for the first thing
+//FIXME: Ensure store_sp is 1 in the first place.
 
     if(store_sp){
         syncpoint_t *sp, dummy= {.pos= INT64_MAX};
@@ -492,8 +498,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
 
         if(flags & FLAG_CODED){
             length++;
-            flags &= ~needed_flags;
-            flags |=  needed_flags;
+            flags = needed_flags;
         }
 
         if((flags & needed_flags) != needed_flags)
@@ -563,7 +568,8 @@ static int write_trailer(AVFormatContext *s){
     NUTContext *nut= s->priv_data;
     ByteIOContext *bc= &s->pb;
 
-    write_headers(nut, bc);
+    while(nut->header_count<3)
+        write_headers(nut, bc);
     put_flush_packet(bc);
 
     return 0;