December 2008 - ffmpeg-cvslog

r16401 - trunk/libavformat/rmdec.c
by subversion＠mplayerhq.hu 31 Dec '08

31 Dec '08

Author: michael Date: Wed Dec 31 01:24:54 2008 New Revision: 16401 Log: Merge videobuf and audiobuf. Modified: trunk/libavformat/rmdec.c Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c Tue Dec 30 22:23:02 2008 (r16400) +++ trunk/libavformat/rmdec.c Wed Dec 31 01:24:54 2008 (r16401) @@ -24,14 +24,13 @@ #include "rm.h" struct RMStream { - uint8_t *videobuf; ///< place to store merged video frame + uint8_t *buf; ///< place to store merged video frame / reordered audio data int videobufsize; ///< current assembled frame size int videobufpos; ///< position for the next slice in the video buffer int curpic_num; ///< picture number of current frame int cur_slice, slices; int64_t pktpos; ///< first slice position in file /// Audio descrambling matrix parameters - uint8_t *audiobuf; ///< place to store reordered audio data int64_t audiotimestamp; ///< Audio packet timestamp int sub_packet_cnt; // Subpacket counter, used while reading int sub_packet_size, sub_packet_h, coded_framesize; ///< Descrambling parameters from container @@ -81,8 +80,7 @@ RMStream *ff_rm_alloc_rmstream (void) void ff_rm_free_rmstream (RMStream *rms) { - av_freep(&rms->videobuf); - av_freep(&rms->audiobuf); + av_freep(&rms->buf); } static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb, @@ -157,7 +155,7 @@ static int rm_read_audio_stream_info(AVF return -1; } - ast->audiobuf = av_malloc(ast->audio_framesize * sub_packet_h); + ast->buf = av_malloc(ast->audio_framesize * sub_packet_h); } else if ((!strcmp(buf, "cook")) || (!strcmp(buf, "atrc")) || (!strcmp(buf, "sipr"))) { int codecdata_length; get_be16(pb); get_byte(pb); @@ -188,7 +186,7 @@ static int rm_read_audio_stream_info(AVF return -1; } - ast->audiobuf = av_malloc(ast->audio_framesize * sub_packet_h); + ast->buf = av_malloc(ast->audio_framesize * sub_packet_h); } else if (!strcmp(buf, "raac") || !strcmp(buf, "racp")) { int codecdata_length; get_be16(pb); get_byte(pb); @@ -523,8 +521,8 @@ static int rm_assemble_video_frame(AVFor if((seq & 0x7F) == 1 || vst->curpic_num != pic_num){ vst->slices = ((hdr & 0x3F) << 1) + 1; vst->videobufsize = len2 + 8*vst->slices + 1; - av_free(vst->videobuf); - if(!(vst->videobuf = av_malloc(vst->videobufsize))) + av_free(vst->buf); + if(!(vst->buf = av_malloc(vst->videobufsize))) return AVERROR(ENOMEM); vst->videobufpos = 8*vst->slices + 1; vst->cur_slice = 0; @@ -536,21 +534,21 @@ static int rm_assemble_video_frame(AVFor if(++vst->cur_slice > vst->slices) return 1; - AV_WL32(vst->videobuf - 7 + 8*vst->cur_slice, 1); - AV_WL32(vst->videobuf - 3 + 8*vst->cur_slice, vst->videobufpos - 8*vst->slices - 1); + AV_WL32(vst->buf - 7 + 8*vst->cur_slice, 1); + AV_WL32(vst->buf - 3 + 8*vst->cur_slice, vst->videobufpos - 8*vst->slices - 1); if(vst->videobufpos + len > vst->videobufsize) return 1; - if (get_buffer(pb, vst->videobuf + vst->videobufpos, len) != len) + if (get_buffer(pb, vst->buf + vst->videobufpos, len) != len) return AVERROR(EIO); vst->videobufpos += len; rm->remaining_len-= len; if(type == 2 || (vst->videobufpos) == vst->videobufsize){ - vst->videobuf[0] = vst->cur_slice-1; + vst->buf[0] = vst->cur_slice-1; if(av_new_packet(pkt, vst->videobufpos - 8*(vst->slices - vst->cur_slice)) < 0) return AVERROR(ENOMEM); - memcpy(pkt->data, vst->videobuf, 1 + 8*vst->cur_slice); - memcpy(pkt->data + 1 + 8*vst->cur_slice, vst->videobuf + 1 + 8*vst->slices, + memcpy(pkt->data, vst->buf, 1 + 8*vst->cur_slice); + memcpy(pkt->data + 1 + 8*vst->cur_slice, vst->buf + 1 + 8*vst->slices, vst->videobufpos - 1 - 8*vst->slices); pkt->pts = AV_NOPTS_VALUE; pkt->pos = vst->pktpos; @@ -606,12 +604,12 @@ ff_rm_parse_packet (AVFormatContext *s, switch(st->codec->codec_id) { case CODEC_ID_RA_288: for (x = 0; x < h/2; x++) - get_buffer(pb, ast->audiobuf+x*2*w+y*cfs, cfs); + get_buffer(pb, ast->buf+x*2*w+y*cfs, cfs); break; case CODEC_ID_ATRAC3: case CODEC_ID_COOK: for (x = 0; x < w/sps; x++) - get_buffer(pb, ast->audiobuf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps); + get_buffer(pb, ast->buf+sps*(h*x+((h+1)/2)*(y&1)+(y>>1)), sps); break; } @@ -623,7 +621,7 @@ ff_rm_parse_packet (AVFormatContext *s, rm->audio_pkt_cnt = h * w / st->codec->block_align - 1; // Release first audio packet av_new_packet(pkt, st->codec->block_align); - memcpy(pkt->data, ast->audiobuf, st->codec->block_align); + memcpy(pkt->data, ast->buf, st->codec->block_align); *timestamp = ast->audiotimestamp; *flags = 2; // Mark first packet as keyframe } @@ -686,7 +684,7 @@ ff_rm_retrieve_cache (AVFormatContext *s av_get_packet(pb, pkt, ast->sub_packet_lengths[ast->sub_packet_cnt - rm->audio_pkt_cnt]); else { av_new_packet(pkt, st->codec->block_align); - memcpy(pkt->data, ast->audiobuf + st->codec->block_align * + memcpy(pkt->data, ast->buf + st->codec->block_align * (ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - rm->audio_pkt_cnt), st->codec->block_align); } @@ -720,13 +718,13 @@ static int rm_read_packet(AVFormatContex for (y = 0; y < ast->sub_packet_h; y++) for (x = 0; x < ast->sub_packet_h/2; x++) - if (get_buffer(pb, ast->audiobuf+x*2*ast->audio_framesize+y*ast->coded_framesize, ast->coded_framesize) <= 0) + if (get_buffer(pb, ast->buf+x*2*ast->audio_framesize+y*ast->coded_framesize, ast->coded_framesize) <= 0) return AVERROR(EIO); rm->audio_stream_num = 0; rm->audio_pkt_cnt = ast->sub_packet_h * ast->audio_framesize / st->codec->block_align - 1; // Release first audio packet av_new_packet(pkt, st->codec->block_align); - memcpy(pkt->data, ast->audiobuf, st->codec->block_align); + memcpy(pkt->data, ast->buf, st->codec->block_align); pkt->flags |= PKT_FLAG_KEY; // Mark first packet as keyframe pkt->stream_index = 0; } else {

1 0

r16400 - trunk/libavformat/rmdec.c
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: michael Date: Tue Dec 30 22:23:02 2008 New Revision: 16400 Log: Simplify the top of rm_assemble_video_frame(). Modified: trunk/libavformat/rmdec.c Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c Tue Dec 30 21:51:18 2008 (r16399) +++ trunk/libavformat/rmdec.c Tue Dec 30 22:23:02 2008 (r16400) @@ -492,42 +492,30 @@ static int rm_assemble_video_frame(AVFor hdr = get_byte(pb); len--; type = hdr >> 6; - switch(type){ - case 0: // slice - case 2: // last slice + + if(type != 3){ // not frame as a part of packet seq = get_byte(pb); len--; + } + if(type != 1){ // not whole frame len2 = get_num(pb, &len); - pos = get_num(pb, &len); - if(len < 1) - return -1; + pos = get_num(pb, &len); pic_num = get_byte(pb); len--; - rm->remaining_len = len; - break; - case 1: //whole frame - if(len<1) + } + if(len<0) + return -1; + rm->remaining_len = len; + if(type&1){ // frame, not slice + if(type == 3) // frame as a part of packet + len= len2; + if(rm->remaining_len < len) return -1; - seq = get_byte(pb); len--; + rm->remaining_len -= len; if(av_new_packet(pkt, len + 9) < 0) return AVERROR(EIO); pkt->data[0] = 0; AV_WL32(pkt->data + 1, 1); AV_WL32(pkt->data + 5, 0); get_buffer(pb, pkt->data + 9, len); - rm->remaining_len = 0; - return 0; - case 3: //frame as a part of packet - len2 = get_num(pb, &len); - pos = get_num(pb, &len); - pic_num = get_byte(pb); len--; - if(len < len2) - return -1; - rm->remaining_len = len - len2; - if(av_new_packet(pkt, len2 + 9) < 0) - return AVERROR(EIO); - pkt->data[0] = 0; - AV_WL32(pkt->data + 1, 1); - AV_WL32(pkt->data + 5, 0); - get_buffer(pb, pkt->data + 9, len2); return 0; } //now we have to deal with single slice

1 0

r16399 - trunk/libavformat/rmdec.c
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: michael Date: Tue Dec 30 21:51:18 2008 New Revision: 16399 Log: Add a few error checks to rm_assemble_video_frame() Modified: trunk/libavformat/rmdec.c Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c Tue Dec 30 20:49:27 2008 (r16398) +++ trunk/libavformat/rmdec.c Tue Dec 30 21:51:18 2008 (r16399) @@ -498,10 +498,14 @@ static int rm_assemble_video_frame(AVFor seq = get_byte(pb); len--; len2 = get_num(pb, &len); pos = get_num(pb, &len); + if(len < 1) + return -1; pic_num = get_byte(pb); len--; rm->remaining_len = len; break; case 1: //whole frame + if(len<1) + return -1; seq = get_byte(pb); len--; if(av_new_packet(pkt, len + 9) < 0) return AVERROR(EIO); @@ -515,6 +519,8 @@ static int rm_assemble_video_frame(AVFor len2 = get_num(pb, &len); pos = get_num(pb, &len); pic_num = get_byte(pb); len--; + if(len < len2) + return -1; rm->remaining_len = len - len2; if(av_new_packet(pkt, len2 + 9) < 0) return AVERROR(EIO);

1 0

r16398 - trunk/libavformat/rmdec.c
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: michael Date: Tue Dec 30 20:49:27 2008 New Revision: 16398 Log: All non zero returns of rm_assemble_video_frame() are errors, check things accordingly. Modified: trunk/libavformat/rmdec.c Modified: trunk/libavformat/rmdec.c ============================================================================== --- trunk/libavformat/rmdec.c Tue Dec 30 13:02:35 2008 (r16397) +++ trunk/libavformat/rmdec.c Tue Dec 30 20:49:27 2008 (r16398) @@ -590,7 +590,7 @@ ff_rm_parse_packet (AVFormatContext *s, if (st->codec->codec_type == CODEC_TYPE_VIDEO) { rm->current_stream= st->id; - if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len) == 1) + if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len)) return -1; //got partial frame } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { if ((st->codec->codec_id == CODEC_ID_RA_288) ||

1 0

r16390 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: reimar Date: Mon Dec 29 17:56:02 2008 New Revision: 16390 Log: My gpg key fingerprint. Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Mon Dec 29 17:39:11 2008 (r16389) +++ trunk/MAINTAINERS Mon Dec 29 17:56:02 2008 (r16390) @@ -313,4 +313,5 @@ GnuPG Fingerprints of maintainers and ot ====================================================================== Michael Niedermayer 9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB +Reimar D?ffinger C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7 Reynaldo H. Verdejo Pinochet 6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A

5 5

r16397 - trunk/ffserver.c
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: cehoyos Date: Tue Dec 30 13:02:35 2008 New Revision: 16397 Log: Silence two icc warnings: /home/melanson/fate/source/ffserver.c(4349): warning #188: enumerated type mixed with another type audio_enc.codec_id = audio_id; ^ /home/melanson/fate/source/ffserver.c(4354): warning #188: enumerated type mixed with another type video_enc.codec_id = video_id; ^ Modified: trunk/ffserver.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c Tue Dec 30 09:47:52 2008 (r16396) +++ trunk/ffserver.c Tue Dec 30 13:02:35 2008 (r16397) @@ -3686,7 +3686,7 @@ static void add_codec(FFStream *stream, memcpy(st->codec, av, sizeof(AVCodecContext)); } -static int opt_audio_codec(const char *arg) +static enum CodecID opt_audio_codec(const char *arg) { AVCodec *p= avcodec_find_encoder_by_name(arg); @@ -3696,7 +3696,7 @@ static int opt_audio_codec(const char *a return p->id; } -static int opt_video_codec(const char *arg) +static enum CodecID opt_video_codec(const char *arg) { AVCodec *p= avcodec_find_encoder_by_name(arg); @@ -3753,7 +3753,7 @@ static int parse_ffconfig(const char *fi FFStream **last_stream, *stream, *redirect; FFStream **last_feed, *feed; AVCodecContext audio_enc, video_enc; - int audio_id, video_id; + enum CodecID audio_id, video_id; f = fopen(filename, "r"); if (!f) {

1 0

r16396 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: benoit Date: Tue Dec 30 09:47:52 2008 New Revision: 16396 Log: Add my GnuPG fingerprint. Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Tue Dec 30 04:13:52 2008 (r16395) +++ trunk/MAINTAINERS Tue Dec 30 09:47:52 2008 (r16396) @@ -312,6 +312,7 @@ x86 GnuPG Fingerprints of maintainers and others who have svn write access ====================================================================== +Benoit Fouet B22A 4F4F 43EF 636B BB66 FCDC 0023 AE1E 2985 49C8 Michael Niedermayer 9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB Reimar D?ffinger C61D 16E5 9E2C D10C 8958 38A4 0899 A2B9 06D4 D9C7 Reynaldo H. Verdejo Pinochet 6E27 CD34 170C C78E 4D4F 5F40 C18E 077F 3114 452A

1 0

r16363 - trunk/libavformat/sierravmd.c
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: kostya Date: Sat Dec 27 18:34:00 2008 New Revision: 16363 Log: Latest Coktel Vision VMDs contained Indeo 3, add demuxer support for it Modified: trunk/libavformat/sierravmd.c Modified: trunk/libavformat/sierravmd.c ============================================================================== --- trunk/libavformat/sierravmd.c Sat Dec 27 17:25:36 2008 (r16362) +++ trunk/libavformat/sierravmd.c Sat Dec 27 18:34:00 2008 (r16363) @@ -49,6 +49,7 @@ typedef struct VmdDemuxContext { unsigned int frames_per_block; vmd_frame *frame_table; unsigned int current_frame; + int is_indeo3; int sample_rate; int64_t audio_sample_counter; @@ -91,6 +92,10 @@ static int vmd_read_header(AVFormatConte if (get_buffer(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) return AVERROR(EIO); + if(vmd->vmd_header[16] == 'i' && vmd->vmd_header[17] == 'v' && vmd->vmd_header[18] == '3') + vmd->is_indeo3 = 1; + else + vmd->is_indeo3 = 1; /* start up the decoders */ vst = av_new_stream(s, 0); if (!vst) @@ -98,10 +103,14 @@ static int vmd_read_header(AVFormatConte av_set_pts_info(vst, 33, 1, 10); vmd->video_stream_index = vst->index; vst->codec->codec_type = CODEC_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_VMDVIDEO; + vst->codec->codec_id = vmd->is_indeo3 ? CODEC_ID_INDEO3 : CODEC_ID_VMDVIDEO; vst->codec->codec_tag = 0; /* no fourcc */ vst->codec->width = AV_RL16(&vmd->vmd_header[12]); vst->codec->height = AV_RL16(&vmd->vmd_header[14]); + if(vmd->is_indeo3 && vst->codec->width > 320){ + vst->codec->width >>= 1; + vst->codec->height >>= 1; + } vst->codec->extradata_size = VMD_HEADER_SIZE; vst->codec->extradata = av_mallocz(VMD_HEADER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); memcpy(vst->codec->extradata, vmd->vmd_header, VMD_HEADER_SIZE); @@ -261,8 +270,11 @@ static int vmd_read_packet(AVFormatConte return AVERROR(ENOMEM); pkt->pos= url_ftell(pb); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); - ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, - frame->frame_size); + if(vmd->is_indeo3) + ret = get_buffer(pb, pkt->data, frame->frame_size); + else + ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, + frame->frame_size); if (ret != frame->frame_size) { av_free_packet(pkt);

4 4

r16395 - in trunk/libavcodec/arm: asm.S h264idct_neon.S simple_idct_neon.S
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: mru Date: Tue Dec 30 04:13:52 2008 New Revision: 16395 Log: ARM: work around linker bug with movw/movt relocations in shared libs Modified: trunk/libavcodec/arm/asm.S trunk/libavcodec/arm/h264idct_neon.S trunk/libavcodec/arm/simple_idct_neon.S Modified: trunk/libavcodec/arm/asm.S ============================================================================== --- trunk/libavcodec/arm/asm.S Tue Dec 30 04:13:48 2008 (r16394) +++ trunk/libavcodec/arm/asm.S Tue Dec 30 04:13:52 2008 (r16395) @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" + .macro require8, val=1 .eabi_attribute 24, \val .endm @@ -34,3 +36,12 @@ .func \name \name: .endm + + .macro movrel rd, val +#if defined(HAVE_ARMV6T2) && !defined(CONFIG_SHARED) + movw \rd, #:lower16:\val + movt \rd, #:upper16:\val +#else + ldr \rd, =\val +#endif + .endm Modified: trunk/libavcodec/arm/h264idct_neon.S ============================================================================== --- trunk/libavcodec/arm/h264idct_neon.S Tue Dec 30 04:13:48 2008 (r16394) +++ trunk/libavcodec/arm/h264idct_neon.S Tue Dec 30 04:13:52 2008 (r16395) @@ -103,8 +103,7 @@ function ff_h264_idct_add16_neon, export mov r1, r2 mov r2, r3 ldr r6, [sp, #24] - movw r7, #:lower16:scan8 - movt r7, #:upper16:scan8 + movrel r7, scan8 mov ip, #16 1: ldrb r8, [r7], #1 ldr r0, [r5], #4 @@ -131,8 +130,7 @@ function ff_h264_idct_add16intra_neon, e mov r1, r2 mov r2, r3 ldr r6, [sp, #24] - movw r7, #:lower16:scan8 - movt r7, #:upper16:scan8 + movrel r7, scan8 mov ip, #16 1: ldrb r8, [r7], #1 ldr r0, [r5], #4 @@ -157,8 +155,7 @@ function ff_h264_idct_add8_neon, export= add r1, r2, #16*32 mov r2, r3 ldr r6, [sp, #32] - movw r7, #:lower16:scan8+16 - movt r7, #:upper16:scan8+16 + movrel r7, scan8+16 mov ip, #8 1: ldrb r8, [r7], #1 ldr r0, [r5], #4 Modified: trunk/libavcodec/arm/simple_idct_neon.S ============================================================================== --- trunk/libavcodec/arm/simple_idct_neon.S Tue Dec 30 04:13:48 2008 (r16394) +++ trunk/libavcodec/arm/simple_idct_neon.S Tue Dec 30 04:13:52 2008 (r16395) @@ -239,8 +239,7 @@ idct_coeff_neon: pld [\data] pld [\data, #64] vpush {d8-d15} - movw r3, #:lower16:idct_coeff_neon - movt r3, #:upper16:idct_coeff_neon + movrel r3, idct_coeff_neon vld1.64 {d0,d1}, [r3,:128] .endm

1 0

r16394 - trunk/configure
by subversion＠mplayerhq.hu 30 Dec '08

30 Dec '08

Author: mru Date: Tue Dec 30 04:13:48 2008 New Revision: 16394 Log: Make shared/static full CONFIG options Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Dec 30 04:13:44 2008 (r16393) +++ trunk/configure Tue Dec 30 04:13:48 2008 (r16394) @@ -772,7 +772,9 @@ CONFIG_LIST=" nonfree postproc powerpc_perf + shared small + static swscale vhook x11grab @@ -896,8 +898,6 @@ CMDLINE_SELECT=" extra_warnings logging optimizations - shared - static stripping "

1 0