January 2008 - ffmpeg-cvslog - lists.ffmpeg.org

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r11694 - trunk/libavcodec/h263.c
by subversion＠mplayerhq.hu 11 Feb '08

11 Feb '08

Author: michael Date: Thu Jan 31 15:01:33 2008 New Revision: 11694 Log: Revert r11689 and r11690 (uninitalized warning fix) as its theoretically undefined in C. Modified: trunk/libavcodec/h263.c Modified: trunk/libavcodec/h263.c ============================================================================== --- trunk/libavcodec/h263.c (original) +++ trunk/libavcodec/h263.c Thu Jan 31 15:01:33 2008 @@ -4727,7 +4727,7 @@ static inline int mpeg4_decode_block(Mpe int n, int coded, int intra, int rvlc) { int level, i, last, run; - int dc_pred_dir= dc_pred_dir; //weird init to prevent uninitalized warning + int dc_pred_dir; RLTable * rl; RL_VLC_ELEM * rl_vlc; const uint8_t * scan_table;

4 3

r11698 - in trunk/libavformat: oggdec.c oggdec.h oggparseogm.c
by subversion＠mplayerhq.hu 01 Feb '08

01 Feb '08

Author: reimar Date: Thu Jan 31 23:30:55 2008 New Revision: 11698 Log: Add support for ogg text subtitles. Modified: trunk/libavformat/oggdec.c trunk/libavformat/oggdec.h trunk/libavformat/oggparseogm.c Modified: trunk/libavformat/oggdec.c ============================================================================== --- trunk/libavformat/oggdec.c (original) +++ trunk/libavformat/oggdec.c Thu Jan 31 23:30:55 2008 @@ -44,6 +44,7 @@ static ogg_codec_t *ogg_codecs[] = { &old_flac_codec, &ogm_video_codec, &ogm_audio_codec, + &ogm_text_codec, &ogm_old_codec, NULL }; Modified: trunk/libavformat/oggdec.h ============================================================================== --- trunk/libavformat/oggdec.h (original) +++ trunk/libavformat/oggdec.h Thu Jan 31 23:30:55 2008 @@ -81,6 +81,7 @@ extern ogg_codec_t flac_codec; extern ogg_codec_t old_flac_codec; extern ogg_codec_t ogm_video_codec; extern ogg_codec_t ogm_audio_codec; +extern ogg_codec_t ogm_text_codec; extern ogg_codec_t ogm_old_codec; extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); Modified: trunk/libavformat/oggparseogm.c ============================================================================== --- trunk/libavformat/oggparseogm.c (original) +++ trunk/libavformat/oggparseogm.c Thu Jan 31 23:30:55 2008 @@ -55,6 +55,10 @@ ogm_header(AVFormatContext *s, int idx) tag = bytestream_get_le32(&p); st->codec->codec_id = codec_get_id(codec_bmp_tags, tag); st->codec->codec_tag = tag; + } else if (*p == 't') { + st->codec->codec_type = CODEC_TYPE_SUBTITLE; + st->codec->codec_id = CODEC_ID_TEXT; + p += 12; } else { uint8_t acid[5]; int cid; @@ -158,6 +162,13 @@ ogg_codec_t ogm_audio_codec = { .packet = ogm_packet }; +ogg_codec_t ogm_text_codec = { + .magic = "\001text", + .magicsize = 5, + .header = ogm_header, + .packet = ogm_packet +}; + ogg_codec_t ogm_old_codec = { .magic = "\001Direct Show Samples embedded in Ogg", .magicsize = 35,

3 2

r11690 - trunk/libavcodec/h263.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: michael Date: Thu Jan 31 03:13:53 2008 New Revision: 11690 Log: Comment about weird warning prevention. Modified: trunk/libavcodec/h263.c Modified: trunk/libavcodec/h263.c ============================================================================== --- trunk/libavcodec/h263.c (original) +++ trunk/libavcodec/h263.c Thu Jan 31 03:13:53 2008 @@ -4727,7 +4727,7 @@ static inline int mpeg4_decode_block(Mpe int n, int coded, int intra, int rvlc) { int level, i, last, run; - int dc_pred_dir= dc_pred_dir; + int dc_pred_dir= dc_pred_dir; //weird init to prevent uninitalized warning RLTable * rl; RL_VLC_ELEM * rl_vlc; const uint8_t * scan_table;

7 16

r11697 - trunk/libavutil/lls.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: michael Date: Thu Jan 31 21:52:14 2008 New Revision: 11697 Log: Fix the following using void* casts, proper casts are less readable and avoiding casts would be even less readable, but other suggestions are welcome. lls.c:56: warning: initialization from incompatible pointer type lls.c:57: warning: initialization from incompatible pointer type Modified: trunk/libavutil/lls.c Modified: trunk/libavutil/lls.c ============================================================================== --- trunk/libavutil/lls.c (original) +++ trunk/libavutil/lls.c Thu Jan 31 21:52:14 2008 @@ -53,8 +53,8 @@ void av_update_lls(LLSModel *m, double * void av_solve_lls(LLSModel *m, double threshold, int min_order){ int i,j,k; - double (*factor)[MAX_VARS+1]= &m->covariance[1][0]; - double (*covar )[MAX_VARS+1]= &m->covariance[1][1]; + double (*factor)[MAX_VARS+1]= (void*)&m->covariance[1][0]; + double (*covar )[MAX_VARS+1]= (void*)&m->covariance[1][1]; double *covar_y = m->covariance[0]; int count= m->indep_count;

1 0

r11696 - in trunk/tests: seek.regression.ref seek_test.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: michael Date: Thu Jan 31 21:04:17 2008 New Revision: 11696 Log: Fix b-libav.ul/al seek regression test. Modified: trunk/tests/seek.regression.ref trunk/tests/seek_test.c Modified: trunk/tests/seek.regression.ref ============================================================================== --- trunk/tests/seek.regression.ref (original) +++ trunk/tests/seek.regression.ref Thu Jan 31 21:04:17 2008 @@ -2597,6 +2597,59 @@ ret: 0 st:-1 ts:-0.645825 flags:1 ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73394 size:4096 flags:1 ---------------- tests/data/b-libav.al +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 +ret: 0 st:-1 ts:-1.000000 flags:0 +ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret: 0 st:-1 ts:1.894167 flags:1 +ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 +ret: 0 st: 0 ts:0.788345 flags:0 +ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 +ret: 0 st: 0 ts:-0.317506 flags:1 +ret:-5 +ret: 0 st:-1 ts:2.576668 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.470835 flags:1 +ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 +ret: 0 st: 0 ts:0.364989 flags:0 +ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 +ret: 0 st: 0 ts:-0.740816 flags:1 +ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret: 0 st:-1 ts:2.153336 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.047503 flags:1 +ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 +ret: 0 st: 0 ts:-0.058322 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.835828 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.730004 flags:0 +ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 +ret: 0 st:-1 ts:0.624171 flags:1 +ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 +ret: 0 st: 0 ts:-0.481678 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.412517 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.306672 flags:0 +ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 +ret: 0 st:-1 ts:0.200839 flags:1 +ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 +ret: 0 st: 0 ts:-0.904989 flags:0 +ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret: 0 st: 0 ts:1.989161 flags:1 +ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 +ret: 0 st:-1 ts:0.883340 flags:0 +ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 +ret: 0 st:-1 ts:-0.222493 flags:1 +ret:-5 +ret: 0 st: 0 ts:2.671655 flags:0 +ret:-5 +ret: 0 st: 0 ts:1.565850 flags:1 +ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 +ret: 0 st:-1 ts:0.460008 flags:0 +ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 +ret: 0 st:-1 ts:-0.645825 flags:1 +ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 ---------------- tests/data/b-libav.asf ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1 @@ -3504,6 +3557,59 @@ ret: 0 st:-1 ts:-0.645825 flags:1 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:-1 size:22036 flags:1 ---------------- tests/data/b-libav.ul +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 +ret: 0 st:-1 ts:-1.000000 flags:0 +ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret: 0 st:-1 ts:1.894167 flags:1 +ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 +ret: 0 st: 0 ts:0.788345 flags:0 +ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 +ret: 0 st: 0 ts:-0.317506 flags:1 +ret:-5 +ret: 0 st:-1 ts:2.576668 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.470835 flags:1 +ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 +ret: 0 st: 0 ts:0.364989 flags:0 +ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 +ret: 0 st: 0 ts:-0.740816 flags:1 +ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret: 0 st:-1 ts:2.153336 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.047503 flags:1 +ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 +ret: 0 st: 0 ts:-0.058322 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.835828 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.730004 flags:0 +ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 +ret: 0 st:-1 ts:0.624171 flags:1 +ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 +ret: 0 st: 0 ts:-0.481678 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.412517 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.306672 flags:0 +ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 +ret: 0 st:-1 ts:0.200839 flags:1 +ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 +ret: 0 st: 0 ts:-0.904989 flags:0 +ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret: 0 st: 0 ts:1.989161 flags:1 +ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 +ret: 0 st:-1 ts:0.883340 flags:0 +ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 +ret: 0 st:-1 ts:-0.222493 flags:1 +ret:-5 +ret: 0 st: 0 ts:2.671655 flags:0 +ret:-5 +ret: 0 st: 0 ts:1.565850 flags:1 +ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 +ret: 0 st:-1 ts:0.460008 flags:0 +ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 +ret: 0 st:-1 ts:-0.645825 flags:1 +ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 ---------------- tests/data/b-libav.voc ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:512 flags:1 Modified: trunk/tests/seek_test.c ============================================================================== --- trunk/tests/seek_test.c (original) +++ trunk/tests/seek_test.c Thu Jan 31 21:04:17 2008 @@ -31,6 +31,10 @@ int main(int argc, char **argv) AVFormatContext *ic; int i, ret, stream_id; int64_t timestamp; + AVFormatParameters params, *ap= &params; + memset(ap, 0, sizeof(params)); + ap->channels=1; + ap->sample_rate= 22050; /* initialize libavcodec, and register all codecs and formats */ av_register_all(); @@ -50,7 +54,7 @@ int main(int argc, char **argv) exit(1); } - ret = av_open_input_file(&ic, filename, NULL, 0, NULL); + ret = av_open_input_file(&ic, filename, NULL, 0, ap); if (ret < 0) { fprintf(stderr, "cannot open %s\n", filename); exit(1);

1 0

r11695 - trunk/libavcodec/dnxhddec.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: bcoudurier Date: Thu Jan 31 15:23:48 2008 New Revision: 11695 Log: fix field order export Modified: trunk/libavcodec/dnxhddec.c Modified: trunk/libavcodec/dnxhddec.c ============================================================================== --- trunk/libavcodec/dnxhddec.c (original) +++ trunk/libavcodec/dnxhddec.c Thu Jan 31 15:23:48 2008 @@ -99,7 +99,7 @@ static int dnxhd_decode_header(DNXHDCont if (buf[5] & 2) { /* interlaced */ ctx->cur_field = buf[5] & 1; ctx->picture.interlaced_frame = 1; - ctx->picture.top_field_first = first_field && ctx->cur_field == 1; + ctx->picture.top_field_first = first_field ^ ctx->cur_field; av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field); }

1 0

r11691 - trunk/libavformat/movenc.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: bcoudurier Date: Thu Jan 31 12:31:56 2008 New Revision: 11691 Log: support rawvideo in mov Modified: trunk/libavformat/movenc.c Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Thu Jan 31 12:31:56 2008 @@ -483,6 +483,14 @@ static const AVCodecTag codec_3gp_tags[] { CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, }; +static const AVCodecTag mov_pix_fmt_tags[] = { + { PIX_FMT_YUYV422, MKTAG('y','u','v','s') }, + { PIX_FMT_YUYV422, MKTAG('2','v','u','y') }, + { PIX_FMT_BGR555, MKTAG('r','a','w',' ') }, + { PIX_FMT_RGB24, MKTAG('r','a','w',' ') }, + { PIX_FMT_BGR32_1, MKTAG('r','a','w',' ') }, +}; + static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) { int tag = track->enc->codec_tag; @@ -495,7 +503,8 @@ static int mov_find_codec_tag(AVFormatCo } else if (track->mode == MODE_3GP || track->mode == MODE_3G2) { tag = codec_get_tag(codec_3gp_tags, track->enc->codec_id); } else if (!tag || (track->enc->strict_std_compliance >= FF_COMPLIANCE_NORMAL && - tag == MKTAG('d','v','c','p'))) { + (tag == MKTAG('d','v','c','p') || + track->enc->codec_id == CODEC_ID_RAWVIDEO))) { if (track->enc->codec_id == CODEC_ID_DVVIDEO) { if (track->enc->height == 480) /* NTSC */ if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','n'); @@ -503,6 +512,10 @@ static int mov_find_codec_tag(AVFormatCo else if (track->enc->pix_fmt == PIX_FMT_YUV422P) tag = MKTAG('d','v','5','p'); else if (track->enc->pix_fmt == PIX_FMT_YUV420P) tag = MKTAG('d','v','c','p'); else tag = MKTAG('d','v','p','p'); + } else if (track->enc->codec_id == CODEC_ID_RAWVIDEO) { + tag = codec_get_tag(mov_pix_fmt_tags, track->enc->pix_fmt); + if (!tag) // restore tag + tag = track->enc->codec_tag; } else { if (track->enc->codec_type == CODEC_TYPE_VIDEO) { tag = codec_get_tag(codec_movvideo_tags, track->enc->codec_id); @@ -569,7 +582,10 @@ static int mov_write_video_tag(ByteIOCon put_byte(pb, strlen(compressor_name)); put_buffer(pb, compressor_name, 31); - put_be16(pb, 0x18); /* Reserved */ + if (track->mode == MODE_MOV && track->enc->bits_per_sample) + put_be16(pb, track->enc->bits_per_sample); + else + put_be16(pb, 0x18); /* Reserved */ put_be16(pb, 0xffff); /* Reserved */ if(track->tag == MKTAG('m','p','4','v')) mov_write_esds_tag(pb, track);

4 6

r11693 - trunk/libavformat/movenc.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: bcoudurier Date: Thu Jan 31 14:40:53 2008 New Revision: 11693 Log: stupid typo Modified: trunk/libavformat/movenc.c Modified: trunk/libavformat/movenc.c ============================================================================== --- trunk/libavformat/movenc.c (original) +++ trunk/libavformat/movenc.c Thu Jan 31 14:40:53 2008 @@ -485,7 +485,7 @@ static const AVCodecTag codec_3gp_tags[] static const AVCodecTag mov_pix_fmt_tags[] = { { PIX_FMT_YUYV422, MKTAG('y','u','v','s') }, - { PIX_FMT_YUYV422, MKTAG('2','v','u','y') }, + { PIX_FMT_UYVY422, MKTAG('2','v','u','y') }, { PIX_FMT_BGR555, MKTAG('r','a','w',' ') }, { PIX_FMT_RGB24, MKTAG('r','a','w',' ') }, { PIX_FMT_BGR32_1, MKTAG('r','a','w',' ') },

1 0

r11692 - trunk/libavcodec/indeo3.c
by subversion＠mplayerhq.hu 31 Jan '08

31 Jan '08

Author: reimar Date: Thu Jan 31 13:25:52 2008 New Revision: 11692 Log: Two tables that should be const Modified: trunk/libavcodec/indeo3.c Modified: trunk/libavcodec/indeo3.c ============================================================================== --- trunk/libavcodec/indeo3.c (original) +++ trunk/libavcodec/indeo3.c Thu Jan 31 13:25:52 2008 @@ -54,13 +54,13 @@ typedef struct Indeo3DecodeContext { unsigned short *corrector_type; } Indeo3DecodeContext; -static int corrector_type_0[24] = { +static const int corrector_type_0[24] = { 195, 159, 133, 115, 101, 93, 87, 77, 195, 159, 133, 115, 101, 93, 87, 77, 128, 79, 79, 79, 79, 79, 79, 79 }; -static int corrector_type_2[8] = { 9, 7, 6, 8, 5, 4, 3, 2 }; +static const int corrector_type_2[8] = { 9, 7, 6, 8, 5, 4, 3, 2 }; static void build_modpred(Indeo3DecodeContext *s) {

1 0