| OLD | NEW |
|---|
| 1 --- unpatched-ffmpeg-mt/libavcodec/h264.h» 2010-02-22 10:46:27 -0800 | 1 Only in unpatched_ffmpeg-mt: ffmpeg-mt |
| 2 +++ patched-ffmpeg-mt/libavcodec/h264.h»2010-03-01 20:54:49 -0800 | 2 diff -rpu unpatched_ffmpeg-mt/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile |
| 3 @@ -583,9 +583,20 @@ | 3 --- unpatched_ffmpeg-mt/libavcodec/Makefile» 2010-03-11 17:46:30 -0800 |
| 4 +++ ffmpeg-mt/libavcodec/Makefile» 2010-03-11 19:12:33 -0800 |
| 5 @@ -493,8 +493,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER) + |
| 6 OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
| 7 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o |
| 8 OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o |
| 9 -OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o flacdata.o flac.o \ |
| 10 - dirac.o mpeg12data.o |
| 11 +OBJS-$(CONFIG_OGG_DEMUXER) += dirac.o mpeg12data.o |
| 12 OBJS-$(CONFIG_OGG_MUXER) += xiph.o flacdec.o flacdata.o flac.o |
| 13 OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o |
| 14 |
| 15 @@ -564,6 +563,14 @@ OBJS-$(CONFIG_VP3_PARSER) + |
| 16 OBJS-$(CONFIG_AAC_ADTSTOASC_BSF) += aac_adtstoasc_bsf.o |
| 17 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o |
| 18 OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o |
| 19 +OBJS-$(CONFIG_MPEG4VIDEO_ES_BSF) += mpeg4video_es_bsf.o \ |
| 20 + mpeg4videoenc.o ituh263enc.o \ |
| 21 + mpegvideo_enc.o motion_est.o \ |
| 22 + ratecontrol.o mpeg12data.o \ |
| 23 + aandcttab.o jfdctfst.o \ |
| 24 + jfdctint.o faandct.o \ |
| 25 + mpeg4video_parser.o mpegvideo.o \ |
| 26 + error_resilience.o |
| 27 OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o |
| 28 OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o |
| 29 OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o |
| 30 @@ -573,6 +580,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) |
| 31 OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o |
| 32 OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o |
| 33 OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o |
| 34 +OBJS-$(CONFIG_VC1_ASFTORCV_BSF) += vc1_asftorcv_bsf.o |
| 35 +OBJS-$(CONFIG_VC1_ASFTOANNEXG_BSF) += vc1_asftoannexg_bsf.o vc1.o \ |
| 36 + vc1data.o |
| 37 |
| 38 # thread libraries |
| 39 OBJS-$(HAVE_BEOSTHREADS) += beosthread.o |
| 40 Only in ffmpeg-mt/libavcodec: Makefile~ |
| 41 diff -rpu unpatched_ffmpeg-mt/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcod
ecs.c |
| 42 --- unpatched_ffmpeg-mt/libavcodec/allcodecs.c» 2010-03-11 17:46:29 -0800 |
| 43 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-03-11 19:12:19 -0800 |
| 44 @@ -384,13 +384,15 @@ void avcodec_register_all(void) |
| 45 REGISTER_BSF (AAC_ADTSTOASC, aac_adtstoasc); |
| 46 REGISTER_BSF (DUMP_EXTRADATA, dump_extradata); |
| 47 REGISTER_BSF (H264_MP4TOANNEXB, h264_mp4toannexb); |
| 48 + REGISTER_BSF (MPEG4VIDEO_ES, mpeg4video_es); |
| 49 REGISTER_BSF (IMX_DUMP_HEADER, imx_dump_header); |
| 50 REGISTER_BSF (MJPEGA_DUMP_HEADER, mjpega_dump_header); |
| 51 REGISTER_BSF (MP3_HEADER_COMPRESS, mp3_header_compress); |
| 52 REGISTER_BSF (MP3_HEADER_DECOMPRESS, mp3_header_decompress); |
| 53 + REGISTER_BSF (VC1_ASFTORCV, vc1_asftorcv); |
| 54 + REGISTER_BSF (VC1_ASFTOANNEXG, vc1_asftoannexg); |
| 55 REGISTER_BSF (MOV2TEXTSUB, mov2textsub); |
| 56 REGISTER_BSF (NOISE, noise); |
| 57 REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata); |
| 58 REGISTER_BSF (TEXT2MOVSUB, text2movsub); |
| 59 } |
| 60 - |
| 61 Only in ffmpeg-mt/libavcodec: allcodecs.c~ |
| 62 diff -rpu unpatched_ffmpeg-mt/libavcodec/h264.h ffmpeg-mt/libavcodec/h264.h |
| 63 --- unpatched_ffmpeg-mt/libavcodec/h264.h» 2010-03-11 17:46:30 -0800 |
| 64 +++ ffmpeg-mt/libavcodec/h264.h»2010-03-11 19:12:59 -0800 |
| 65 @@ -599,9 +599,20 @@ typedef struct H264Context{ |
| 4 | 66 |
| 5 extern const uint8_t ff_h264_chroma_qp[52]; | 67 extern const uint8_t ff_h264_chroma_qp[52]; |
| 6 | 68 |
| 7 +#if CONFIG_SVQ3_DECODER | 69 +#if CONFIG_SVQ3_DECODER |
| 8 void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); | 70 void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp); |
| 9 | 71 |
| 10 void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int d
c); | 72 void ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int d
c); |
| 11 +#else | 73 +#else |
| 12 + | 74 + |
| 13 +#define SVQ3_DISABLED_FUNC { av_log(NULL, AV_LOG_FATAL, "Calling svq3 when disa
bled.\n"); } | 75 +#define SVQ3_DISABLED_FUNC { av_log(NULL, AV_LOG_FATAL, "Calling svq3 when disa
bled.\n"); } |
| 14 + | 76 + |
| 15 +static void inline ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) SVQ3_
DISABLED_FUNC; | 77 +static void inline ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) SVQ3_
DISABLED_FUNC; |
| 16 + | 78 + |
| 17 +static void inline ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride,
int qp, int dc) SVQ3_DISABLED_FUNC; | 79 +static void inline ff_svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride,
int qp, int dc) SVQ3_DISABLED_FUNC; |
| 18 + | 80 + |
| 19 +#endif | 81 +#endif |
| 20 + | 82 + |
| 21 | 83 |
| 22 /** | 84 /** |
| 23 * Decode SEI | 85 * Decode SEI |
| 86 Only in ffmpeg-mt/libavcodec: h264.h~ |
| 87 diff -rpu unpatched_ffmpeg-mt/libavcodec/mpeg4video.h ffmpeg-mt/libavcodec/mpeg4
video.h |
| 88 --- unpatched_ffmpeg-mt/libavcodec/mpeg4video.h 2010-03-11 17:46:30 -0800 |
| 89 +++ ffmpeg-mt/libavcodec/mpeg4video.h 2010-03-11 19:12:02 -0800 |
| 90 @@ -91,6 +91,9 @@ void mpeg4_encode_mb(MpegEncContext *s, |
| 91 void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n, |
| 92 int dir); |
| 93 void ff_set_mpeg4_time(MpegEncContext * s); |
| 94 +void mpeg4_encode_gop_header(MpegEncContext * s); |
| 95 +void mpeg4_encode_visual_object_header(MpegEncContext * s); |
| 96 +void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
; |
| 97 void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number); |
| 98 |
| 99 int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb); |
| 100 Only in ffmpeg-mt/libavcodec: mpeg4video.h~ |
| 101 Only in ffmpeg-mt/libavcodec: mpeg4video_es_bsf.c |
| 102 diff -rpu unpatched_ffmpeg-mt/libavcodec/mpeg4videoenc.c ffmpeg-mt/libavcodec/mp
eg4videoenc.c |
| 103 --- unpatched_ffmpeg-mt/libavcodec/mpeg4videoenc.c 2010-03-11 17:46:30 -080
0 |
| 104 +++ ffmpeg-mt/libavcodec/mpeg4videoenc.c 2010-03-11 19:12:02 -0800 |
| 105 @@ -872,7 +872,7 @@ void ff_set_mpeg4_time(MpegEncContext * |
| 106 } |
| 107 } |
| 108 |
| 109 -static void mpeg4_encode_gop_header(MpegEncContext * s){ |
| 110 +void mpeg4_encode_gop_header(MpegEncContext * s){ |
| 111 int hours, minutes, seconds; |
| 112 int64_t time; |
| 113 |
| 114 @@ -902,7 +902,7 @@ static void mpeg4_encode_gop_header(Mpeg |
| 115 ff_mpeg4_stuffing(&s->pb); |
| 116 } |
| 117 |
| 118 -static void mpeg4_encode_visual_object_header(MpegEncContext * s){ |
| 119 +void mpeg4_encode_visual_object_header(MpegEncContext * s){ |
| 120 int profile_and_level_indication; |
| 121 int vo_ver_id; |
| 122 |
| 123 @@ -947,7 +947,7 @@ static void mpeg4_encode_visual_object_h |
| 124 ff_mpeg4_stuffing(&s->pb); |
| 125 } |
| 126 |
| 127 -static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_
number) |
| 128 +void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number) |
| 129 { |
| 130 int vo_ver_id; |
| 131 |
| 132 Only in ffmpeg-mt/libavcodec: vc1_asftoannexg_bsf.c |
| 133 Only in ffmpeg-mt/libavcodec: vc1_asftorcv_bsf.c |
| 134 diff -rpu unpatched_ffmpeg-mt/libavformat/Makefile ffmpeg-mt/libavformat/Makefil
e |
| 135 --- unpatched_ffmpeg-mt/libavformat/Makefile 2010-03-11 17:46:31 -0800 |
| 136 +++ ffmpeg-mt/libavformat/Makefile 2010-03-11 19:12:33 -0800 |
| 137 @@ -141,13 +141,13 @@ OBJS-$(CONFIG_NUT_DEMUXER) |
| 138 OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o |
| 139 OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o |
| 140 OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ |
| 141 - oggparsedirac.o \ |
| 142 - oggparseflac.o \ |
| 143 oggparseogm.o \ |
| 144 - oggparsespeex.o \ |
| 145 oggparsetheora.o \ |
| 146 oggparsevorbis.o \ |
| 147 riff.o |
| 148 +OBJS-$(CONFIG_DIRAC_DEMUXER) += oggparsedirac.o |
| 149 +OBJS-$(CONFIG_FLAC_DECODER) += oggparseflac.o |
| 150 +OBJS-$(CONFIG_LIBSPEEX) += oggparsespeex.o |
| 151 OBJS-$(CONFIG_OGG_MUXER) += oggenc.o |
| 152 OBJS-$(CONFIG_OMA_DEMUXER) += oma.o raw.o |
| 153 OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += raw.o |
| 154 diff -rpu unpatched_ffmpeg-mt/libavformat/mov.c ffmpeg-mt/libavformat/mov.c |
| 155 --- unpatched_ffmpeg-mt/libavformat/mov.c 2010-03-11 17:46:31 -0800 |
| 156 +++ ffmpeg-mt/libavformat/mov.c 2010-03-11 19:08:40 -0800 |
| 157 @@ -312,6 +312,8 @@ static int mov_read_dref(MOVContext *c, |
| 158 MOVDref *dref = &sc->drefs[i]; |
| 159 uint32_t size = get_be32(pb); |
| 160 int64_t next = url_ftell(pb) + size - 4; |
| 161 + if (size < 8) |
| 162 + return -1; |
| 163 |
| 164 dref->type = get_le32(pb); |
| 165 get_be32(pb); // version + flags |
| 166 Only in ffmpeg-mt/libavformat: mov.c~ |
| 167 diff -rpu unpatched_ffmpeg-mt/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.
c |
| 168 --- unpatched_ffmpeg-mt/libavformat/oggdec.c 2010-03-11 17:46:31 -0800 |
| 169 +++ ffmpeg-mt/libavformat/oggdec.c 2010-03-11 19:12:46 -0800 |
| 170 @@ -38,13 +38,23 @@ |
| 171 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE |
| 172 |
| 173 static const struct ogg_codec * const ogg_codecs[] = { |
| 174 +#if CONFIG_DIRAC_DEMUXER |
| 175 &ff_dirac_codec, |
| 176 +#endif |
| 177 +#if CONFIG_LIBSPEEX |
| 178 &ff_speex_codec, |
| 179 +#endif |
| 180 &ff_vorbis_codec, |
| 181 &ff_theora_codec, |
| 182 +#if CONFIG_FLAC_DECODER |
| 183 &ff_flac_codec, |
| 184 +#endif |
| 185 +#if CONFIG_DIRAC_DEMUXER |
| 186 &ff_old_dirac_codec, |
| 187 +#endif |
| 188 +#if CONFIG_FLAC_DECODER |
| 189 &ff_old_flac_codec, |
| 190 +#endif |
| 191 &ff_ogm_video_codec, |
| 192 &ff_ogm_audio_codec, |
| 193 &ff_ogm_text_codec, |
| 194 @@ -200,7 +210,7 @@ ogg_new_buf(struct ogg *ogg, int idx) |
| 195 } |
| 196 |
| 197 static int |
| 198 -ogg_read_page (AVFormatContext * s, int *str) |
| 199 +ogg_read_page (AVFormatContext * s, int *str, int64_t *offset) |
| 200 { |
| 201 ByteIOContext *bc = s->pb; |
| 202 struct ogg *ogg = s->priv_data; |
| 203 @@ -214,6 +224,7 @@ ogg_read_page (AVFormatContext * s, int |
| 204 int size, idx; |
| 205 uint8_t sync[4]; |
| 206 int sp = 0; |
| 207 + int64_t poffset = url_ftell(bc); |
| 208 |
| 209 if (get_buffer (bc, sync, 4) < 4) |
| 210 return -1; |
| 211 @@ -298,18 +309,22 @@ ogg_read_page (AVFormatContext * s, int |
| 212 |
| 213 if (str) |
| 214 *str = idx; |
| 215 + if (offset) |
| 216 + *offset = poffset; |
| 217 |
| 218 return 0; |
| 219 } |
| 220 |
| 221 static int |
| 222 -ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize) |
| 223 +ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t* of
fset) |
| 224 { |
| 225 struct ogg *ogg = s->priv_data; |
| 226 int idx, i; |
| 227 struct ogg_stream *os; |
| 228 int complete = 0; |
| 229 int segp = 0, psize = 0; |
| 230 + int64_t poffset; |
| 231 + int pnum = 0; |
| 232 |
| 233 #if 0 |
| 234 av_log (s, AV_LOG_DEBUG, "ogg_packet: curidx=%i\n", ogg->curidx); |
| 235 @@ -319,10 +334,13 @@ ogg_packet (AVFormatContext * s, int *st |
| 236 idx = ogg->curidx; |
| 237 |
| 238 while (idx < 0){ |
| 239 - if (ogg_read_page (s, &idx) < 0) |
| 240 + if (ogg_read_page (s, &idx, &poffset) < 0) |
| 241 return -1; |
| 242 } |
| 243 |
| 244 + if (pnum++ == 0 && offset) |
| 245 + *offset = poffset; |
| 246 + |
| 247 os = ogg->streams + idx; |
| 248 |
| 249 #if 0 |
| 250 @@ -418,12 +436,15 @@ static int |
| 251 ogg_get_headers (AVFormatContext * s) |
| 252 { |
| 253 struct ogg *ogg = s->priv_data; |
| 254 + int64_t pos = 0; |
| 255 |
| 256 do{ |
| 257 - if (ogg_packet (s, NULL, NULL, NULL) < 0) |
| 258 + if (ogg_packet (s, NULL, NULL, NULL, &pos) < 0) |
| 259 return -1; |
| 260 }while (!ogg->headers); |
| 261 |
| 262 + s->data_offset = pos; |
| 263 + |
| 264 #if 0 |
| 265 av_log (s, AV_LOG_DEBUG, "found headers\n"); |
| 266 #endif |
| 267 @@ -472,7 +493,7 @@ ogg_get_length (AVFormatContext * s) |
| 268 ogg_save (s); |
| 269 url_fseek (s->pb, end, SEEK_SET); |
| 270 |
| 271 - while (!ogg_read_page (s, &i)){ |
| 272 + while (!ogg_read_page (s, &i, NULL)){ |
| 273 if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 && |
| 274 ogg->streams[i].codec) |
| 275 idx = i; |
| 276 @@ -523,7 +544,7 @@ ogg_read_packet (AVFormatContext * s, AV |
| 277 |
| 278 //Get an ogg packet |
| 279 do{ |
| 280 - if (ogg_packet (s, &idx, &pstart, &psize) < 0) |
| 281 + if (ogg_packet (s, &idx, &pstart, &psize, NULL) < 0) |
| 282 return AVERROR(EIO); |
| 283 }while (idx < 0 || !s->streams[idx]); |
| 284 |
| 285 @@ -585,14 +606,17 @@ ogg_read_timestamp (AVFormatContext * s, |
| 286 ByteIOContext *bc = s->pb; |
| 287 int64_t pts = AV_NOPTS_VALUE; |
| 288 int i; |
| 289 + int64_t fpoffset = AV_NOPTS_VALUE; |
| 290 + int64_t poffset; |
| 291 url_fseek(bc, *pos_arg, SEEK_SET); |
| 292 - while (url_ftell(bc) < pos_limit && !ogg_read_page (s, &i)) { |
| 293 + while (url_ftell(bc) < pos_limit && !ogg_read_page (s, &i, &poffset)) { |
| 294 + if (fpoffset == AV_NOPTS_VALUE && i == stream_index) |
| 295 + fpoffset = poffset; |
| 296 if (ogg->streams[i].granule != -1 && ogg->streams[i].granule != 0 && |
| 297 ogg->streams[i].codec && i == stream_index) { |
| 298 pts = ogg_gptopts(s, i, ogg->streams[i].granule, NULL); |
| 299 - // FIXME: this is the position of the packet after the one with abo
ve |
| 300 - // pts. |
| 301 - *pos_arg = url_ftell(bc); |
| 302 + *pos_arg = fpoffset; |
| 303 + url_fseek(bc, fpoffset, SEEK_SET); |
| 304 break; |
| 305 } |
| 306 } |
| 307 Only in ffmpeg-mt/libavformat: oggdec.c~ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 789004:
ffmpeg roll of source to mar 9 version... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/