annotate nutenc.c @ 3754:8d267b43eaba libavformat

Move malloc() down until after all initializations, so that the resource is only allocated if initialization worked. This means that on failure, we don't have to deallocate it.
author rbultje
date Sat, 23 Aug 2008 18:46:30 +0000
parents e5b79592e187
children 27537074f2a9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
1 /*
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
2 * nut muxer
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
3 * Copyright (c) 2004-2007 Michael Niedermayer
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
4 *
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
5 * This file is part of FFmpeg.
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
6 *
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
11 *
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
15 * Lesser General Public License for more details.
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
16 *
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
20 */
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
21
3286
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3135
diff changeset
22 #include "libavutil/tree.h"
6f61c3b36632 Use full path for #includes from another directory.
diego
parents: 3135
diff changeset
23 #include "libavcodec/mpegaudiodata.h"
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
24 #include "nut.h"
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
25
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
26 static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
27 int sample_rate= c->sample_rate;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
28
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
29 if(size>4096)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
30 return 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
31
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
32 AV_WB24(out, 1);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
33
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
34 if(c->codec_id == CODEC_ID_MPEG4){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
35 if(key_frame){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
36 return 3;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
37 }else{
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
38 out[3]= 0xB6;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
39 return 4;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
40 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
41 }else if(c->codec_id == CODEC_ID_MPEG1VIDEO || c->codec_id == CODEC_ID_MPEG2VIDEO){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
42 return 3;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
43 }else if(c->codec_id == CODEC_ID_H264){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
44 return 3;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
45 }else if(c->codec_id == CODEC_ID_MP3 || c->codec_id == CODEC_ID_MP2){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
46 int lsf, mpeg25, sample_rate_index, bitrate_index, frame_size;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
47 int layer= c->codec_id == CODEC_ID_MP3 ? 3 : 2;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
48 unsigned int header= 0xFFF00000;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
49
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
50 lsf = sample_rate < (24000+32000)/2;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
51 mpeg25 = sample_rate < (12000+16000)/2;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
52 sample_rate <<= lsf + mpeg25;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
53 if (sample_rate < (32000 + 44100)/2) sample_rate_index=2;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
54 else if(sample_rate < (44100 + 48000)/2) sample_rate_index=0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
55 else sample_rate_index=1;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
56
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
57 sample_rate= ff_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
58
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
59 for(bitrate_index=2; bitrate_index<30; bitrate_index++){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
60 frame_size = ff_mpa_bitrate_tab[lsf][layer-1][bitrate_index>>1];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
61 frame_size = (frame_size * 144000) / (sample_rate << lsf) + (bitrate_index&1);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
62
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
63 if(frame_size == size)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
64 break;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
65 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
66
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
67 header |= (!lsf)<<19;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
68 header |= (4-layer)<<17;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
69 header |= 1<<16; //no crc
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
70 AV_WB32(out, header);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
71 if(size <= 0)
3135
cf8df6a00eb5 misc spelling fixes
diego
parents: 3120
diff changeset
72 return 2; //we guess there is no crc, if there is one the user clearly does not care about overhead
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
73 if(bitrate_index == 30)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
74 return -1; //something is wrong ...
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
75
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
76 header |= (bitrate_index>>1)<<12;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
77 header |= sample_rate_index<<10;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
78 header |= (bitrate_index&1)<<9;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
79
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
80 return 2; //FIXME actually put the needed ones in build_elision_headers()
3135
cf8df6a00eb5 misc spelling fixes
diego
parents: 3120
diff changeset
81 return 3; //we guess that the private bit is not set
cf8df6a00eb5 misc spelling fixes
diego
parents: 3120
diff changeset
82 //FIXME the above assumptions should be checked, if these turn out false too often something should be done
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
83 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
84 return 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
85 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
86
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
87 static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size, int frame_type){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
88 NUTContext *nut = s->priv_data;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
89 uint8_t out[64];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
90 int i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
91 int len= find_expected_header(c, size, frame_type, out);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
92
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
93 //av_log(NULL, AV_LOG_ERROR, "expected_h len=%d size=%d codec_id=%d\n", len, size, c->codec_id);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
94
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
95 for(i=1; i<nut->header_count; i++){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
96 if( len == nut->header_len[i]
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
97 && !memcmp(out, nut->header[i], len)){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
98 // av_log(NULL, AV_LOG_ERROR, "found %d\n", i);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
99 return i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
100 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
101 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
102 // av_log(NULL, AV_LOG_ERROR, "nothing found\n");
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
103 return 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
104 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
105
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
106 static void build_elision_headers(AVFormatContext *s){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
107 NUTContext *nut = s->priv_data;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
108 int i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
109 //FIXME this is lame
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
110 //FIXME write a 2pass mode to find the maximal headers
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
111 const static uint8_t headers[][5]={
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
112 {3, 0x00, 0x00, 0x01},
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
113 {4, 0x00, 0x00, 0x01, 0xB6},
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
114 {2, 0xFF, 0xFA}, //mp3+crc
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
115 {2, 0xFF, 0xFB}, //mp3
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
116 {2, 0xFF, 0xFC}, //mp2+crc
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
117 {2, 0xFF, 0xFD}, //mp2
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
118 };
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
119
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
120 nut->header_count= 7;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
121 for(i=1; i<nut->header_count; i++){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
122 nut->header_len[i]= headers[i-1][0];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
123 nut->header [i]= &headers[i-1][1];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
124 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
125 }
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
126
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
127 static void build_frame_code(AVFormatContext *s){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
128 NUTContext *nut = s->priv_data;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
129 int key_frame, index, pred, stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
130 int start=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
131 int end= 254;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
132 int keyframe_0_esc= s->nb_streams > 2;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
133 int pred_table[10];
2339
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
134 FrameCode *ft;
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
135
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
136 ft= &nut->frame_code[start];
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
137 ft->flags= FLAG_CODED;
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
138 ft->size_mul=1;
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
139 ft->pts_delta=1;
2c8579bcd287 add a universal fallback frame code for the case that no other applies
michael
parents: 2332
diff changeset
140 start++;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
141
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
142 if(keyframe_0_esc){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
143 /* keyframe = 0 escape */
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
144 FrameCode *ft= &nut->frame_code[start];
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
145 ft->flags= FLAG_STREAM_ID | FLAG_SIZE_MSB | FLAG_CODED_PTS;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
146 ft->size_mul=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
147 start++;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
148 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
149
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
150 for(stream_id= 0; stream_id<s->nb_streams; stream_id++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
151 int start2= start + (end-start)*stream_id / s->nb_streams;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
152 int end2 = start + (end-start)*(stream_id+1) / s->nb_streams;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
153 AVCodecContext *codec = s->streams[stream_id]->codec;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
154 int is_audio= codec->codec_type == CODEC_TYPE_AUDIO;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
155 int intra_only= /*codec->intra_only || */is_audio;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
156 int pred_count;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
157
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
158 for(key_frame=0; key_frame<2; key_frame++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
159 if(intra_only && keyframe_0_esc && key_frame==0)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
160 continue;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
161
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
162 {
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
163 FrameCode *ft= &nut->frame_code[start2];
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
164 ft->flags= FLAG_KEY*key_frame;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
165 ft->flags|= FLAG_SIZE_MSB | FLAG_CODED_PTS;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
166 ft->stream_id= stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
167 ft->size_mul=1;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
168 if(is_audio)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
169 ft->header_idx= find_header_idx(s, codec, -1, key_frame);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
170 start2++;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
171 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
172 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
173
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
174 key_frame= intra_only;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
175 #if 1
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
176 if(is_audio){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
177 int frame_bytes= codec->frame_size*(int64_t)codec->bit_rate / (8*codec->sample_rate);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
178 int pts;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
179 for(pts=0; pts<2; pts++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
180 for(pred=0; pred<2; pred++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
181 FrameCode *ft= &nut->frame_code[start2];
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
182 ft->flags= FLAG_KEY*key_frame;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
183 ft->stream_id= stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
184 ft->size_mul=frame_bytes + 2;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
185 ft->size_lsb=frame_bytes + pred;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
186 ft->pts_delta=pts;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
187 ft->header_idx= find_header_idx(s, codec, frame_bytes + pred, key_frame);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
188 start2++;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
189 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
190 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
191 }else{
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
192 FrameCode *ft= &nut->frame_code[start2];
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
193 ft->flags= FLAG_KEY | FLAG_SIZE_MSB;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
194 ft->stream_id= stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
195 ft->size_mul=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
196 ft->pts_delta=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
197 start2++;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
198 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
199 #endif
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
200
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
201 if(codec->has_b_frames){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
202 pred_count=5;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
203 pred_table[0]=-2;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
204 pred_table[1]=-1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
205 pred_table[2]=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
206 pred_table[3]=3;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
207 pred_table[4]=4;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
208 }else if(codec->codec_id == CODEC_ID_VORBIS){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
209 pred_count=3;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
210 pred_table[0]=2;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
211 pred_table[1]=9;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
212 pred_table[2]=16;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
213 }else{
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
214 pred_count=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
215 pred_table[0]=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
216 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
217
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
218 for(pred=0; pred<pred_count; pred++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
219 int start3= start2 + (end2-start2)*pred / pred_count;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
220 int end3 = start2 + (end2-start2)*(pred+1) / pred_count;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
221
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
222 for(index=start3; index<end3; index++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
223 FrameCode *ft= &nut->frame_code[index];
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
224 ft->flags= FLAG_KEY*key_frame;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
225 ft->flags|= FLAG_SIZE_MSB;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
226 ft->stream_id= stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
227 //FIXME use single byte size and pred from last
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
228 ft->size_mul= end3-start3;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
229 ft->size_lsb= index - start3;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
230 ft->pts_delta= pred_table[pred];
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
231 if(is_audio)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
232 ft->header_idx= find_header_idx(s, codec, -1, key_frame);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
233 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
234 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
235 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
236 memmove(&nut->frame_code['N'+1], &nut->frame_code['N'], sizeof(FrameCode)*(255-'N'));
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
237 nut->frame_code[ 0].flags=
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
238 nut->frame_code[255].flags=
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
239 nut->frame_code['N'].flags= FLAG_INVALID;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
240 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
241
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
242 /**
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
243 * Gets the length in bytes which is needed to store val as v.
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
244 */
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
245 static int get_length(uint64_t val){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
246 int i=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
247
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
248 while(val>>=7)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
249 i++;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
250
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
251 return i;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
252 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
253
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
254 static void put_v(ByteIOContext *bc, uint64_t val){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
255 int i= get_length(val);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
256
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
257 while(--i>0)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
258 put_byte(bc, 128 | (val>>(7*i)));
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
259
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
260 put_byte(bc, val&127);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
261 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
262
2342
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
263 static void put_t(NUTContext *nut, StreamContext *nus, ByteIOContext *bc, uint64_t val){
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
264 val *= nut->time_base_count;
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
265 val += nus->time_base - nut->time_base;
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
266 put_v(bc, val);
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
267 }
dfb3b2cff096 put_t()
michael
parents: 2341
diff changeset
268
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
269 /**
2393
fc685315d568 spelling/wording cosmetics
diego
parents: 2372
diff changeset
270 * Stores a string as vb.
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
271 */
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
272 static void put_str(ByteIOContext *bc, const char *string){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
273 int len= strlen(string);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
274
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
275 put_v(bc, len);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
276 put_buffer(bc, string, len);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
277 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
278
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
279 static void put_s(ByteIOContext *bc, int64_t val){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
280 put_v(bc, 2*FFABS(val) - (val>0));
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
281 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
282
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
283 #ifdef TRACE
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
284 static inline void put_v_trace(ByteIOContext *bc, uint64_t v, char *file, char *func, int line){
2344
a7fd892b1a57 get rid of printf
michael
parents: 2343
diff changeset
285 av_log(NULL, AV_LOG_DEBUG, "put_v %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
286
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
287 put_v(bc, v);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
288 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
289
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
290 static inline void put_s_trace(ByteIOContext *bc, int64_t v, char *file, char *func, int line){
2344
a7fd892b1a57 get rid of printf
michael
parents: 2343
diff changeset
291 av_log(NULL, AV_LOG_DEBUG, "put_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
292
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
293 put_s(bc, v);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
294 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
295 #define put_v(bc, v) put_v_trace(bc, v, __FILE__, __PRETTY_FUNCTION__, __LINE__)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
296 #define put_s(bc, v) put_s_trace(bc, v, __FILE__, __PRETTY_FUNCTION__, __LINE__)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
297 #endif
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
298
2340
ab5509871fd2 2 FIXME comments
michael
parents: 2339
diff changeset
299 //FIXME remove calculate_checksum
2347
5c32dd0eafc6 fix header_checksum
michael
parents: 2346
diff changeset
300 static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){
2331
4d1a56112d92 use a dynamic ByteIOContext instead of using the lavf buffer
michael
parents: 2330
diff changeset
301 uint8_t *dyn_buf=NULL;
4d1a56112d92 use a dynamic ByteIOContext instead of using the lavf buffer
michael
parents: 2330
diff changeset
302 int dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
2332
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
303 int forw_ptr= dyn_size + 4*calculate_checksum;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
304
2332
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
305 if(forw_ptr > 4096)
2683
153d6efc05b8 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents: 2393
diff changeset
306 init_checksum(bc, ff_crc04C11DB7_update, 0);
2347
5c32dd0eafc6 fix header_checksum
michael
parents: 2346
diff changeset
307 put_be64(bc, startcode);
2332
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
308 put_v(bc, forw_ptr);
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
309 if(forw_ptr > 4096)
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
310 put_le32(bc, get_checksum(bc));
7dd23262372f forw_ptr CRC
michael
parents: 2331
diff changeset
311
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
312 if(calculate_checksum)
2683
153d6efc05b8 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents: 2393
diff changeset
313 init_checksum(bc, ff_crc04C11DB7_update, 0);
2331
4d1a56112d92 use a dynamic ByteIOContext instead of using the lavf buffer
michael
parents: 2330
diff changeset
314 put_buffer(bc, dyn_buf, dyn_size);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
315 if(calculate_checksum)
2331
4d1a56112d92 use a dynamic ByteIOContext instead of using the lavf buffer
michael
parents: 2330
diff changeset
316 put_le32(bc, get_checksum(bc));
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
317
2331
4d1a56112d92 use a dynamic ByteIOContext instead of using the lavf buffer
michael
parents: 2330
diff changeset
318 av_free(dyn_buf);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
319 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
320
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
321 static void write_mainheader(NUTContext *nut, ByteIOContext *bc){
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
322 int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields, tmp_head_idx;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
323 int64_t tmp_match;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
324
2360
b2eeaa4df665 muxer should now be spec compliant (though it likely still contains bugs!)
michael
parents: 2359
diff changeset
325 put_v(bc, 3); /* version */
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
326 put_v(bc, nut->avf->nb_streams);
3014
66fb9d4dea91 nut->max_distance was not set at all anywhere in the NUT muxer
ods15
parents: 3004
diff changeset
327 put_v(bc, nut->max_distance);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
328 put_v(bc, nut->time_base_count);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
329
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
330 for(i=0; i<nut->time_base_count; i++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
331 put_v(bc, nut->time_base[i].num);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
332 put_v(bc, nut->time_base[i].den);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
333 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
334
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
335 tmp_pts=0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
336 tmp_mul=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
337 tmp_stream=0;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
338 tmp_match= 1-(1LL<<62);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
339 tmp_head_idx= 0;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
340 for(i=0; i<256;){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
341 tmp_fields=0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
342 tmp_size=0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
343 // tmp_res=0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
344 if(tmp_pts != nut->frame_code[i].pts_delta) tmp_fields=1;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
345 if(tmp_mul != nut->frame_code[i].size_mul ) tmp_fields=2;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
346 if(tmp_stream != nut->frame_code[i].stream_id) tmp_fields=3;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
347 if(tmp_size != nut->frame_code[i].size_lsb ) tmp_fields=4;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
348 // if(tmp_res != nut->frame_code[i].res ) tmp_fields=5;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
349 if(tmp_head_idx!=nut->frame_code[i].header_idx)tmp_fields=8;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
350
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
351 tmp_pts = nut->frame_code[i].pts_delta;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
352 tmp_flags = nut->frame_code[i].flags;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
353 tmp_stream= nut->frame_code[i].stream_id;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
354 tmp_mul = nut->frame_code[i].size_mul;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
355 tmp_size = nut->frame_code[i].size_lsb;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
356 // tmp_res = nut->frame_code[i].res;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
357 tmp_head_idx= nut->frame_code[i].header_idx;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
358
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
359 for(j=0; i<256; j++,i++){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
360 if(i == 'N'){
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
361 j--;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
362 continue;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
363 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
364 if(nut->frame_code[i].pts_delta != tmp_pts ) break;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
365 if(nut->frame_code[i].flags != tmp_flags ) break;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
366 if(nut->frame_code[i].stream_id != tmp_stream) break;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
367 if(nut->frame_code[i].size_mul != tmp_mul ) break;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
368 if(nut->frame_code[i].size_lsb != tmp_size+j) break;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
369 // if(nut->frame_code[i].res != tmp_res ) break;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
370 if(nut->frame_code[i].header_idx!= tmp_head_idx) break;
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
371 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
372 if(j != tmp_mul - tmp_size) tmp_fields=6;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
373
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
374 put_v(bc, tmp_flags);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
375 put_v(bc, tmp_fields);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
376 if(tmp_fields>0) put_s(bc, tmp_pts);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
377 if(tmp_fields>1) put_v(bc, tmp_mul);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
378 if(tmp_fields>2) put_v(bc, tmp_stream);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
379 if(tmp_fields>3) put_v(bc, tmp_size);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
380 if(tmp_fields>4) put_v(bc, 0 /*tmp_res*/);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
381 if(tmp_fields>5) put_v(bc, j);
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
382 if(tmp_fields>6) put_v(bc, tmp_match);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
383 if(tmp_fields>7) put_v(bc, tmp_head_idx);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
384 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
385 put_v(bc, nut->header_count-1);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
386 for(i=1; i<nut->header_count; i++){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
387 put_v(bc, nut->header_len[i]);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
388 put_buffer(bc, nut->header[i], nut->header_len[i]);
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
389 }
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
390 }
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
391
2330
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
392 static int write_streamheader(NUTContext *nut, ByteIOContext *bc, AVCodecContext *codec, int i){
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
393 put_v(bc, i);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
394 switch(codec->codec_type){
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
395 case CODEC_TYPE_VIDEO: put_v(bc, 0); break;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
396 case CODEC_TYPE_AUDIO: put_v(bc, 1); break;
3101
83537aac00f1 subtitles (codec tag tables still missing ...)
michael
parents: 3047
diff changeset
397 case CODEC_TYPE_SUBTITLE: put_v(bc, 2); break;
2330
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
398 default : put_v(bc, 3); break;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
399 }
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
400 put_v(bc, 4);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
401 if (codec->codec_tag){
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
402 put_le32(bc, codec->codec_tag);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
403 }else
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
404 return -1;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
405
2341
michael
parents: 2340
diff changeset
406 put_v(bc, nut->stream[i].time_base - nut->time_base);
2330
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
407 put_v(bc, nut->stream[i].msb_pts_shift);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
408 put_v(bc, nut->stream[i].max_pts_distance);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
409 put_v(bc, codec->has_b_frames);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
410 put_byte(bc, 0); /* flags: 0x1 - fixed_fps, 0x2 - index_present */
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
411
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
412 put_v(bc, codec->extradata_size);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
413 put_buffer(bc, codec->extradata, codec->extradata_size);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
414
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
415 switch(codec->codec_type){
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
416 case CODEC_TYPE_AUDIO:
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
417 put_v(bc, codec->sample_rate);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
418 put_v(bc, 1);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
419 put_v(bc, codec->channels);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
420 break;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
421 case CODEC_TYPE_VIDEO:
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
422 put_v(bc, codec->width);
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
423 put_v(bc, codec->height);
2363
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
424
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
425 if(codec->sample_aspect_ratio.num<=0 || codec->sample_aspect_ratio.den<=0){
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
426 put_v(bc, 0);
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
427 put_v(bc, 0);
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
428 }else{
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
429 put_v(bc, codec->sample_aspect_ratio.num);
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
430 put_v(bc, codec->sample_aspect_ratio.den);
3f3a4b5fc5bb ensure that the aspect ratio is spec compliant
michael
parents: 2361
diff changeset
431 }
2330
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
432 put_v(bc, 0); /* csp type -- unknown */
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
433 break;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
434 default:
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
435 break;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
436 }
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
437 return 0;
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
438 }
c25f63f009a8 move stream header writing into its own function
michael
parents: 2329
diff changeset
439
3004
327814e7bf03 Missing const found by -Wwrite-strings.
michael
parents: 2939
diff changeset
440 static int add_info(ByteIOContext *bc, const char *type, const char *value){
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
441 put_str(bc, type);
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
442 put_s(bc, -1);
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
443 put_str(bc, value);
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
444 return 1;
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
445 }
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
446
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
447 static int write_globalinfo(NUTContext *nut, ByteIOContext *bc){
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
448 AVFormatContext *s= nut->avf;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
449 ByteIOContext *dyn_bc;
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
450 uint8_t *dyn_buf=NULL;
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
451 int count=0, dyn_size;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
452 int ret = url_open_dyn_buf(&dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
453 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
454 return ret;
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
455
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
456 if(s->title [0]) count+= add_info(dyn_bc, "Title" , s->title);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
457 if(s->author [0]) count+= add_info(dyn_bc, "Author" , s->author);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
458 if(s->copyright[0]) count+= add_info(dyn_bc, "Copyright", s->copyright);
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
459 if(!(s->streams[0]->codec->flags & CODEC_FLAG_BITEXACT))
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
460 count+= add_info(dyn_bc, "Encoder" , LIBAVFORMAT_IDENT);
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
461
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
462 put_v(bc, 0); //stream_if_plus1
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
463 put_v(bc, 0); //chapter_id
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
464 put_v(bc, 0); //timestamp_start
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
465 put_v(bc, 0); //length
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
466
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
467 put_v(bc, count);
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
468
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
469 dyn_size= url_close_dyn_buf(dyn_bc, &dyn_buf);
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
470 put_buffer(bc, dyn_buf, dyn_size);
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
471 av_free(dyn_buf);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
472 return 0;
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
473 }
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
474
3120
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
475 static int write_streaminfo(NUTContext *nut, ByteIOContext *bc, int stream_id){
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
476 AVFormatContext *s= nut->avf;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
477 AVStream* st = s->streams[stream_id];
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
478 ByteIOContext *dyn_bc;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
479 uint8_t *dyn_buf=NULL;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
480 int count=0, dyn_size, i;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
481 int ret = url_open_dyn_buf(&dyn_bc);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
482 if(ret < 0)
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
483 return ret;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
484
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
485 for (i=0; ff_nut_dispositions[i].flag; ++i) {
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
486 if (st->disposition & ff_nut_dispositions[i].flag)
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
487 count += add_info(dyn_bc, "Disposition", ff_nut_dispositions[i].str);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
488 }
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
489 dyn_size = url_close_dyn_buf(dyn_bc, &dyn_buf);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
490
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
491 if (count) {
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
492 put_v(bc, stream_id + 1); //stream_id_plus1
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
493 put_v(bc, 0); //chapter_id
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
494 put_v(bc, 0); //timestamp_start
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
495 put_v(bc, 0); //length
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
496
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
497 put_v(bc, count);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
498
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
499 put_buffer(bc, dyn_buf, dyn_size);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
500 }
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
501
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
502 av_free(dyn_buf);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
503 return count;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
504 }
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
505
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
506 static int write_headers(NUTContext *nut, ByteIOContext *bc){
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
507 ByteIOContext *dyn_bc;
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
508 int i, ret;
2345
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
509
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
510 ret = url_open_dyn_buf(&dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
511 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
512 return ret;
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
513 write_mainheader(nut, dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
514 put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE);
2345
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
515
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
516 for (i=0; i < nut->avf->nb_streams; i++){
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
517 AVCodecContext *codec = nut->avf->streams[i]->codec;
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
518
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
519 ret = url_open_dyn_buf(&dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
520 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
521 return ret;
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
522 write_streamheader(nut, dyn_bc, codec, i);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
523 put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
2345
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
524 }
2358
ed9b81f74317 info packet
michael
parents: 2355
diff changeset
525
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
526 ret = url_open_dyn_buf(&dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
527 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
528 return ret;
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
529 write_globalinfo(nut, dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
530 put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
2359
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
531
3120
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
532 for (i = 0; i < nut->avf->nb_streams; i++) {
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
533 ret = url_open_dyn_buf(&dyn_bc);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
534 if(ret < 0)
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
535 return ret;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
536 ret = write_streaminfo(nut, dyn_bc, i);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
537 if (ret < 0)
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
538 return ret;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
539 if (ret > 0)
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
540 put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
541 else {
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
542 uint8_t* buf;
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
543 url_close_dyn_buf(dyn_bc, &buf);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
544 av_free(buf);
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
545 }
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
546 }
ea5623a8efde Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
eugeni
parents: 3112
diff changeset
547
2359
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
548 nut->last_syncpoint_pos= INT_MIN;
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
549 nut->header_count++;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
550 return 0;
2345
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
551 }
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
552
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
553 static int write_header(AVFormatContext *s){
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
554 NUTContext *nut = s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
555 ByteIOContext *bc = s->pb;
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
556 int i, j;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
557
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
558 nut->avf= s;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
559
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
560 nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
561 nut->time_base= av_mallocz(sizeof(AVRational )*s->nb_streams);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
562
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
563 for(i=0; i<s->nb_streams; i++){
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
564 AVStream *st= s->streams[i];
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
565 int ssize;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
566 AVRational time_base;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
567 ff_parse_specific_params(st->codec, &time_base.den, &ssize, &time_base.num);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
568
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
569 av_set_pts_info(st, 64, time_base.num, time_base.den);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
570
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
571 for(j=0; j<nut->time_base_count; j++){
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
572 if(!memcmp(&time_base, &nut->time_base[j], sizeof(AVRational))){
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
573 break;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
574 }
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
575 }
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
576 nut->time_base[j]= time_base;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
577 nut->stream[i].time_base= &nut->time_base[j];
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
578 if(j==nut->time_base_count)
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
579 nut->time_base_count++;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
580
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
581 if(av_q2d(time_base) >= 0.001)
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
582 nut->stream[i].msb_pts_shift = 7;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
583 else
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
584 nut->stream[i].msb_pts_shift = 14;
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
585 nut->stream[i].max_pts_distance= FFMAX(1/av_q2d(time_base), 1);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
586 }
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
587
3014
66fb9d4dea91 nut->max_distance was not set at all anywhere in the NUT muxer
ods15
parents: 3004
diff changeset
588 nut->max_distance = MAX_DISTANCE;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
589 build_elision_headers(s);
2329
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
590 build_frame_code(s);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
591 assert(nut->frame_code['N'].flags == FLAG_INVALID);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
592
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
593 put_buffer(bc, ID_STRING, strlen(ID_STRING));
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
594 put_byte(bc, 0);
57a352c5b051 move main header writing into its own function
michael
parents: 2328
diff changeset
595
2345
b73b443c43d0 move header writing into its own function
michael
parents: 2344
diff changeset
596 write_headers(nut, bc);
2325
2829faf72879 write stream headers
michael
parents: 2324
diff changeset
597
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
598 put_flush_packet(bc);
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
599
2359
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
600 //FIXME index
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
601
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
602 return 0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
603 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
604
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
605 static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, AVPacket *pkt){
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
606 int flags= 0;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
607
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
608 if(pkt->flags & PKT_FLAG_KEY ) flags |= FLAG_KEY;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
609 if(pkt->stream_index != fc->stream_id ) flags |= FLAG_STREAM_ID;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
610 if(pkt->size / fc->size_mul ) flags |= FLAG_SIZE_MSB;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
611 if(pkt->pts - nus->last_pts != fc->pts_delta) flags |= FLAG_CODED_PTS;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
612 if(pkt->size > 2*nut->max_distance ) flags |= FLAG_CHECKSUM;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
613 if(FFABS(pkt->pts - nus->last_pts)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
614 > nus->max_pts_distance) flags |= FLAG_CHECKSUM;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
615 if( pkt->size < nut->header_len[fc->header_idx]
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
616 || (pkt->size > 4096 && fc->header_idx)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
617 || memcmp(pkt->data, nut->header[fc->header_idx], nut->header_len[fc->header_idx]))
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
618 flags |= FLAG_HEADER_IDX;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
619
2371
253901bf60b7 do not remove FLAG_CODED
michael
parents: 2370
diff changeset
620 return flags | (fc->flags & FLAG_CODED);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
621 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
622
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
623 static int find_best_header_idx(NUTContext *nut, AVPacket *pkt){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
624 int i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
625 int best_i = 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
626 int best_len= 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
627
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
628 if(pkt->size > 4096)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
629 return 0;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
630
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
631 for(i=1; i<nut->header_count; i++){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
632 if( pkt->size >= nut->header_len[i]
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
633 && nut->header_len[i] > best_len
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
634 && !memcmp(pkt->data, nut->header[i], nut->header_len[i])){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
635 best_i= i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
636 best_len= nut->header_len[i];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
637 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
638 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
639 return best_i;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
640 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
641
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
642 static int write_packet(AVFormatContext *s, AVPacket *pkt){
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
643 NUTContext *nut = s->priv_data;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
644 StreamContext *nus= &nut->stream[pkt->stream_index];
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
645 ByteIOContext *bc = s->pb, *dyn_bc;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
646 FrameCode *fc;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
647 int64_t coded_pts;
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
648 int best_length, frame_code, flags, needed_flags, i, header_idx, best_header_idx;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
649 int key_frame = !!(pkt->flags & PKT_FLAG_KEY);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
650 int store_sp=0;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
651 int ret;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
652
3508
834b97115722 Prevent invalid timestamps from being stored.
michael
parents: 3424
diff changeset
653 if(pkt->pts < 0)
834b97115722 Prevent invalid timestamps from being stored.
michael
parents: 3424
diff changeset
654 return -1;
834b97115722 Prevent invalid timestamps from being stored.
michael
parents: 3424
diff changeset
655
2359
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
656 if(1LL<<(20+3*nut->header_count) <= url_ftell(bc))
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
657 write_headers(nut, bc);
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
658
3015
db8d14740060 Fix intented algo in syncpoint writing before keyframes in NUT muxer
ods15
parents: 3014
diff changeset
659 if(key_frame && !(nus->last_flags & FLAG_KEY))
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
660 store_sp= 1;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
661
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
662 if(pkt->size + 30/*FIXME check*/ + url_ftell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
663 store_sp= 1;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
664
2393
fc685315d568 spelling/wording cosmetics
diego
parents: 2372
diff changeset
665 //FIXME: Ensure store_sp is 1 in the first place.
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
666
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
667 if(store_sp){
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
668 syncpoint_t *sp, dummy= {.pos= INT64_MAX};
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
669
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
670 ff_nut_reset_ts(nut, *nus->time_base, pkt->dts);
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
671 for(i=0; i<s->nb_streams; i++){
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
672 AVStream *st= s->streams[i];
3016
eac2648449a5 back_ptr calculation used wrong timebase when searching for back syncpoint
ods15
parents: 3015
diff changeset
673 int64_t dts_tb = av_rescale_rnd(pkt->dts,
eac2648449a5 back_ptr calculation used wrong timebase when searching for back syncpoint
ods15
parents: 3015
diff changeset
674 nus->time_base->num * (int64_t)nut->stream[i].time_base->den,
eac2648449a5 back_ptr calculation used wrong timebase when searching for back syncpoint
ods15
parents: 3015
diff changeset
675 nus->time_base->den * (int64_t)nut->stream[i].time_base->num,
eac2648449a5 back_ptr calculation used wrong timebase when searching for back syncpoint
ods15
parents: 3015
diff changeset
676 AV_ROUND_DOWN);
eac2648449a5 back_ptr calculation used wrong timebase when searching for back syncpoint
ods15
parents: 3015
diff changeset
677 int index= av_index_search_timestamp(st, dts_tb, AVSEEK_FLAG_BACKWARD);
2939
7e246e837176 Consider initial EOR in the back_ptr calculation.
michael
parents: 2771
diff changeset
678 if(index>=0) dummy.pos= FFMIN(dummy.pos, st->index_entries[index].pos);
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
679 }
2939
7e246e837176 Consider initial EOR in the back_ptr calculation.
michael
parents: 2771
diff changeset
680 if(dummy.pos == INT64_MAX)
7e246e837176 Consider initial EOR in the back_ptr calculation.
michael
parents: 2771
diff changeset
681 dummy.pos= 0;
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
682 sp= av_tree_find(nut->syncpoints, &dummy, ff_nut_sp_pos_cmp, NULL);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
683
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
684 nut->last_syncpoint_pos= url_ftell(bc);
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
685 ret = url_open_dyn_buf(&dyn_bc);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
686 if(ret < 0)
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
687 return ret;
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
688 put_t(nut, nus, dyn_bc, pkt->dts);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
689 put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos)>>4 : 0);
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
690 put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE);
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
691
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
692 ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
693 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
694 assert(nus->last_pts != AV_NOPTS_VALUE);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
695
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
696 coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
697 if(ff_lsb2full(nus, coded_pts) != pkt->pts)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
698 coded_pts= pkt->pts + (1<<nus->msb_pts_shift);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
699
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
700 best_header_idx= find_best_header_idx(nut, pkt);
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
701
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
702 best_length=INT_MAX;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
703 frame_code= -1;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
704 for(i=0; i<256; i++){
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
705 int length= 0;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
706 FrameCode *fc= &nut->frame_code[i];
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
707 int flags= fc->flags;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
708
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
709 if(flags & FLAG_INVALID)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
710 continue;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
711 needed_flags= get_needed_flags(nut, nus, fc, pkt);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
712
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
713 if(flags & FLAG_CODED){
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
714 length++;
2372
5c3d8e112e79 simplify
michael
parents: 2371
diff changeset
715 flags = needed_flags;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
716 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
717
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
718 if((flags & needed_flags) != needed_flags)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
719 continue;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
720
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
721 if((flags ^ needed_flags) & FLAG_KEY)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
722 continue;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
723
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
724 if(flags & FLAG_STREAM_ID)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
725 length+= get_length(pkt->stream_index);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
726
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
727 if(pkt->size % fc->size_mul != fc->size_lsb)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
728 continue;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
729 if(flags & FLAG_SIZE_MSB)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
730 length += get_length(pkt->size / fc->size_mul);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
731
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
732 if(flags & FLAG_CHECKSUM)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
733 length+=4;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
734
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
735 if(flags & FLAG_CODED_PTS)
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
736 length += get_length(coded_pts);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
737
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
738 if( (flags & FLAG_CODED)
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
739 && nut->header_len[best_header_idx] > nut->header_len[fc->header_idx]+1){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
740 flags |= FLAG_HEADER_IDX;
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
741 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
742
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
743 if(flags & FLAG_HEADER_IDX){
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
744 length += 1 - nut->header_len[best_header_idx];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
745 }else{
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
746 length -= nut->header_len[fc->header_idx];
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
747 }
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
748
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
749 length*=4;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
750 length+= !(flags & FLAG_CODED_PTS);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
751 length+= !(flags & FLAG_CHECKSUM);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
752
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
753 if(length < best_length){
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
754 best_length= length;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
755 frame_code=i;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
756 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
757 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
758 assert(frame_code != -1);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
759 fc= &nut->frame_code[frame_code];
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
760 flags= fc->flags;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
761 needed_flags= get_needed_flags(nut, nus, fc, pkt);
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
762 header_idx= fc->header_idx;
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
763
2683
153d6efc05b8 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
bcoudurier
parents: 2393
diff changeset
764 init_checksum(bc, ff_crc04C11DB7_update, 0);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
765 put_byte(bc, frame_code);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
766 if(flags & FLAG_CODED){
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
767 put_v(bc, (flags^needed_flags) & ~(FLAG_CODED));
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
768 flags = needed_flags;
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
769 }
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
770 if(flags & FLAG_STREAM_ID) put_v(bc, pkt->stream_index);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
771 if(flags & FLAG_CODED_PTS) put_v(bc, coded_pts);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
772 if(flags & FLAG_SIZE_MSB) put_v(bc, pkt->size / fc->size_mul);
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
773 if(flags & FLAG_HEADER_IDX) put_v(bc, header_idx= best_header_idx);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
774
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
775 if(flags & FLAG_CHECKSUM) put_le32(bc, get_checksum(bc));
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
776 else get_checksum(bc);
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
777
3046
c12367fe98ad Header elision muxing support.
michael
parents: 3016
diff changeset
778 put_buffer(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
2343
c6a7a89a0cef write frames and syncpoints
michael
parents: 2342
diff changeset
779 nus->last_flags= flags;
3047
3c374f48768d It appears last_pts was not set ...
michael
parents: 3046
diff changeset
780 nus->last_pts= pkt->pts;
2350
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
781
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
782 //FIXME just store one per syncpoint
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
783 if(flags & FLAG_KEY)
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
784 av_add_index_entry(
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
785 s->streams[pkt->stream_index],
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
786 nut->last_syncpoint_pos,
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
787 pkt->pts,
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
788 0,
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
789 0,
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
790 AVINDEX_KEYFRAME);
a0fb5ef1ec7c set back ptr properly
michael
parents: 2347
diff changeset
791
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
792 return 0;
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
793 }
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
794
2346
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
795 static int write_trailer(AVFormatContext *s){
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
796 NUTContext *nut= s->priv_data;
2771
d52c718e83f9 Use dynamically allocated ByteIOContext in AVFormatContext
andoma
parents: 2683
diff changeset
797 ByteIOContext *bc= s->pb;
2346
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
798
2359
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
799 while(nut->header_count<3)
1860d5b4be2e header repetition
michael
parents: 2358
diff changeset
800 write_headers(nut, bc);
2346
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
801 put_flush_packet(bc);
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
802
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
803 return 0;
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
804 }
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
805
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
806 AVOutputFormat nut_muxer = {
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
807 "nut",
3424
7a0230981402 Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
diego
parents: 3286
diff changeset
808 NULL_IF_CONFIG_SMALL("NUT format"),
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
809 "video/x-nut",
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
810 "nut",
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
811 sizeof(NUTContext),
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
812 #ifdef CONFIG_LIBVORBIS
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
813 CODEC_ID_VORBIS,
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
814 #elif defined(CONFIG_LIBMP3LAME)
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
815 CODEC_ID_MP3,
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
816 #else
3623
e5b79592e187 remove a comment which is no longer true
jbr
parents: 3508
diff changeset
817 CODEC_ID_MP2,
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
818 #endif
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
819 CODEC_ID_MPEG4,
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
820 write_header,
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
821 write_packet,
2346
cbcd840cf971 store headers twice (getting closer to spec compliance ...)
michael
parents: 2345
diff changeset
822 write_trailer,
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
823 .flags = AVFMT_GLOBALHEADER,
3112
88e032ac11e7 Subtitle support. (untested)
michael
parents: 3101
diff changeset
824 .codec_tag= (const AVCodecTag*[]){codec_bmp_tags, codec_wav_tags, ff_nut_subtitle_tags, 0},
2324
919efc8760a0 trying to finally get the nut muxer back uptodate
michael
parents:
diff changeset
825 };