June 2010 - ffmpeg-cvslog - lists.ffmpeg.org

r18533 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 10 Jan '11

10 Jan '11

Author: michael Date: Thu Apr 16 06:46:44 2009 New Revision: 18533 Log: Support broken avc nal encapsulation. Fixes issue987. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Apr 16 04:28:49 2009 (r18532) +++ trunk/libavcodec/h264.c Thu Apr 16 06:46:44 2009 (r18533) @@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context int buf_index=0; H264Context *hx; ///< thread context int context_count = 0; + int next_avc= h->is_avc ? 0 : buf_size; h->max_contexts = avctx->thread_count; #if 0 @@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context int i, nalsize = 0; int err; - if(h->is_avc) { + if(buf_index >= next_avc) { if(buf_index >= buf_size) break; nalsize = 0; for(i = 0; i < h->nal_length_size; i++) @@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context break; } } + next_avc= buf_index + nalsize; } else { // start code prefix search for(; buf_index + 3 < buf_size; buf_index++){ @@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context hx = h->thread_context[context_count]; - ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); + ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); if (ptr==NULL || dst_length < 0){ return -1; } @@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); } - if (h->is_avc && (nalsize != consumed)){ + if (h->is_avc && (nalsize != consumed) && nalsize){ int i, debug_level = AV_LOG_DEBUG; for (i = consumed; i < nalsize; i++) if (buf[buf_index+i]) debug_level = AV_LOG_ERROR; av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); - consumed= nalsize; } buf_index += consumed;

3 7

r15641 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 23 Dec '10

23 Dec '10

Author: michael Date: Sun Oct 19 03:02:48 2008 New Revision: 15641 Log: Check for pts==dts on I/P frames in the presence of non low delay decoding and discard these invalid timestamps. fixes issue171. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Sun Oct 19 03:02:48 2008 @@ -838,6 +838,14 @@ static void compute_pkt_fields(AVFormatC pkt->dts -= 1LL<<st->pts_wrap_bits; } + // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) + // we take the conservative approach and discard both + // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. + if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ + av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); + pkt->dts= pkt->pts= AV_NOPTS_VALUE; + } + if (pkt->duration == 0) { compute_frame_duration(&num, &den, st, pc, pkt); if (den && num) {

2 1

r20814 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 15 Dec '10

15 Dec '10

Author: michael Date: Sat Dec 12 20:44:01 2009 New Revision: 20814 Log: Be less picky on invalid invalid frame_pred_frame_dct values. Fixed issue1615. Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Sat Dec 12 20:15:56 2009 (r20813) +++ trunk/libavcodec/mpeg12.c Sat Dec 12 20:44:01 2009 (r20814) @@ -1557,7 +1557,7 @@ static void mpeg_decode_picture_coding_e s->picture_structure= PICT_FRAME; } - if(s->progressive_frame && !s->frame_pred_frame_dct){ + if(s->progressive_sequence && !s->frame_pred_frame_dct){ av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); s->frame_pred_frame_dct= 1; }

3 3

r22301 - in trunk/libavformat: avformat.h utils.c
by subversion＠mplayerhq.hu 28 Sep '10

28 Sep '10

Author: alexc Date: Mon Mar 8 01:00:50 2010 New Revision: 22301 Log: av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling. The sample rate, frame size, and channel count from the container are not reliable when backwards compatible signaling is used. Modified: trunk/libavformat/avformat.h trunk/libavformat/utils.c Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Mon Mar 8 00:53:47 2010 (r22300) +++ trunk/libavformat/avformat.h Mon Mar 8 01:00:50 2010 (r22301) @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 54 +#define LIBAVFORMAT_VERSION_MINOR 55 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Mon Mar 8 00:53:47 2010 (r22300) +++ trunk/libavformat/utils.c Mon Mar 8 01:00:50 2010 (r22301) @@ -2116,6 +2116,11 @@ int av_find_stream_info(AVFormatContext for(i=0;i<ic->nb_streams;i++) { st = ic->streams[i]; + if (st->codec->codec_id == CODEC_ID_AAC) { + st->codec->sample_rate = 0; + st->codec->frame_size = 0; + st->codec->channels = 0; + } if(st->codec->codec_type == CODEC_TYPE_VIDEO){ /* if(!st->time_base.num) st->time_base= */

3 2

r23764 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 24 Sep '10

24 Sep '10

Author: bcoudurier Date: Fri Jun 25 03:19:03 2010 New Revision: 23764 Log: Improve mov atom parsing debug message, print parent atom and size in decimal Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c Fri Jun 25 00:13:52 2010 (r23763) +++ trunk/libavformat/mov.c Fri Jun 25 03:19:03 2010 (r23764) @@ -266,8 +266,8 @@ static int mov_read_default(MOVContext * a.type = get_le32(pb); } total_size += 8; - dprintf(c->fc, "type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n", - a.type, (char*)&a.type, a.size, atom.size, total_size); + dprintf(c->fc, "type: %08x '%.4s' parent:'%.4s' sz: %"PRId64" %"PRId64" %"PRId64"\n", + a.type, (char*)&a.type, (char*)&atom.type, a.size, total_size, atom.size); if (a.size == 1) { /* 64 bit extended size */ a.size = get_be64(pb) - 8; total_size += 8; @@ -960,7 +960,7 @@ static int mov_read_stsd(MOVContext *c, //Parsing Sample description table enum CodecID id; int dref_id = 1; - MOVAtom a = { 0 }; + MOVAtom a = { AV_RL32("stsd") }; int64_t start_pos = url_ftell(pb); int size = get_be32(pb); /* size */ uint32_t format = get_le32(pb); /* data format */ @@ -2366,7 +2366,7 @@ static int mov_read_header(AVFormatConte MOVContext *mov = s->priv_data; ByteIOContext *pb = s->pb; int err; - MOVAtom atom = { 0 }; + MOVAtom atom = { AV_RL32("root") }; mov->fc = s; /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */ @@ -2430,7 +2430,7 @@ static int mov_read_packet(AVFormatConte if (!sample) { mov->found_mdat = 0; if (!url_is_streamed(s->pb) || - mov_read_default(mov, s->pb, (MOVAtom){ 0, INT64_MAX }) < 0 || + mov_read_default(mov, s->pb, (MOVAtom){ AV_RL32("root"), INT64_MAX }) < 0 || url_feof(s->pb)) return AVERROR_EOF; dprintf(s, "read fragments, offset 0x%llx\n", url_ftell(s->pb));

4 5

r21666 - in trunk: Changelog libavformat/Makefile libavformat/allformats.c libavformat/avformat.h libavformat/concat.c
by subversion＠mplayerhq.hu 21 Sep '10

21 Sep '10

Author: stefano Date: Sun Feb 7 11:25:58 2010 New Revision: 21666 Log: Implement a physical concatenation protocol. Patch by Michele Orr? reverse(<moc.liamg at yp.rekam>). Added: trunk/libavformat/concat.c Modified: trunk/Changelog trunk/libavformat/Makefile trunk/libavformat/allformats.c trunk/libavformat/avformat.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Sun Feb 7 03:00:00 2010 (r21665) +++ trunk/Changelog Sun Feb 7 11:25:58 2010 (r21666) @@ -54,6 +54,7 @@ version <next>: - Bink demuxer and Bink Audio decoder - enable symbol versioning by default for linkers that support it - IFF PBM/ILBM bitmap decoder +- concat protocol Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile Sun Feb 7 03:00:00 2010 (r21665) +++ trunk/libavformat/Makefile Sun Feb 7 11:25:58 2010 (r21666) @@ -269,6 +269,7 @@ OBJS-$(CONFIG_RTMP_PROTOCOL) OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o # libavdevice dependencies OBJS-$(CONFIG_JACK_INDEV) += timefilter.o Modified: trunk/libavformat/allformats.c ============================================================================== --- trunk/libavformat/allformats.c Sun Feb 7 03:00:00 2010 (r21665) +++ trunk/libavformat/allformats.c Sun Feb 7 11:25:58 2010 (r21666) @@ -221,4 +221,5 @@ void av_register_all(void) REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (TCP, tcp); REGISTER_PROTOCOL (UDP, udp); + REGISTER_PROTOCOL (CONCAT, concat); } Modified: trunk/libavformat/avformat.h ============================================================================== --- trunk/libavformat/avformat.h Sun Feb 7 03:00:00 2010 (r21665) +++ trunk/libavformat/avformat.h Sun Feb 7 11:25:58 2010 (r21666) @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 50 +#define LIBAVFORMAT_VERSION_MINOR 51 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ Added: trunk/libavformat/concat.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavformat/concat.c Sun Feb 7 11:25:58 2010 (r21666) @@ -0,0 +1,198 @@ +/* + * Concat URL protocol + * Copyright (c) 2006 Steve Lhomme + * Copyright (c) 2007 Wolfram Gloger + * Copyright (c) 2010 Michele Orr? + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "libavutil/avstring.h" +#include "libavutil/mem.h" + +#define AV_CAT_SEPARATOR "|" + +struct concat_nodes { + URLContext *uc; ///< node's URLContext + int64_t size; ///< url filesize +}; + +struct concat_data { + struct concat_nodes *nodes; ///< list of nodes to concat + size_t length; ///< number of cat'ed nodes + size_t current; ///< index of currently read node +}; + +static av_cold int concat_close(URLContext *h) +{ + int err = 0; + size_t i; + struct concat_data *data = h->priv_data; + struct concat_nodes *nodes = data->nodes; + + for (i = 0; i != data->length; i++) + err |= url_close(nodes[i].uc); + + av_freep(&data->nodes); + av_freep(&h->priv_data); + + return err < 0 ? -1 : 0; +} + +static av_cold int concat_open(URLContext *h, const char *uri, int flags) +{ + char *node_uri = NULL, *tmp_uri; + int err = 0; + int64_t size; + size_t len, i; + URLContext *uc; + struct concat_data *data; + struct concat_nodes *nodes; + + av_strstart(uri, "concat:", &uri); + + /* creating data */ + if (!(data = av_mallocz(sizeof(*data)))) + return AVERROR(ENOMEM); + h->priv_data = data; + + for (i = 0, len = 1; uri[i]; i++) + if (uri[i] == *AV_CAT_SEPARATOR) + /* integer overflow */ + if (++len == UINT_MAX / sizeof(*nodes)) { + av_freep(&h->priv_data); + return AVERROR(ENAMETOOLONG); + } + + if (!(nodes = av_malloc(sizeof(*nodes) * len))) { + av_freep(&h->priv_data); + return AVERROR(ENOMEM); + } else + data->nodes = nodes; + + /* handle input */ + if (!*uri) + err = AVERROR(ENOENT); + for (i = 0; *uri; i++) { + /* parsing uri */ + len = strcspn(uri, AV_CAT_SEPARATOR); + if (!(tmp_uri = av_realloc(node_uri, len+1))) { + err = AVERROR(ENOMEM); + break; + } else + node_uri = tmp_uri; + av_strlcpy(node_uri, uri, len+1); + uri += len + strspn(uri+len, AV_CAT_SEPARATOR); + + /* creating URLContext */ + if ((err = url_open(&uc, node_uri, flags)) < 0) + break; + + /* creating size */ + if ((size = url_filesize(uc)) < 0) { + url_close(uc); + err = AVERROR(ENOSYS); + break; + } + + /* assembling */ + nodes[i].uc = uc; + nodes[i].size = size; + } + av_free(node_uri); + data->length = i; + + if (err < 0) + concat_close(h); + else if (!(nodes = av_realloc(nodes, data->length * sizeof(*nodes)))) { + concat_close(h); + err = AVERROR(ENOMEM); + } else + data->nodes = nodes; + return err; +} + +static int concat_read(URLContext *h, unsigned char *buf, int size) +{ + int result, total = 0; + struct concat_data *data = h->priv_data; + struct concat_nodes *nodes = data->nodes; + size_t i = data->current; + + while (size > 0) { + result = url_read(nodes[i].uc, buf, size); + if (result < 0) + return total ? total : result; + if (!result) + if (i + 1 == data->length || + url_seek(nodes[++i].uc, 0, SEEK_SET) < 0) + break; + total += result; + buf += result; + size -= result; + } + data->current = i; + return total; +} + +static int64_t concat_seek(URLContext *h, int64_t pos, int whence) +{ + int64_t result; + struct concat_data *data = h->priv_data; + struct concat_nodes *nodes = data->nodes; + size_t i; + + switch (whence) { + case SEEK_END: + for (i = data->length - 1; + i && pos < -nodes[i-1].size; + i--) + pos += nodes[i-1].size; + break; + case SEEK_CUR: + /* get the absolute position */ + for (i = 0; i != data->current; i++) + pos += nodes[i].size; + pos += url_seek(nodes[i].uc, 0, SEEK_CUR); + whence = SEEK_SET; + /* fall through with the absolute position */ + case SEEK_SET: + for (i = 0; i != data->length - 1 && pos >= nodes[i].size; i++) + pos -= nodes[i].size; + break; + default: + return AVERROR(EINVAL); + } + + result = url_seek(nodes[i].uc, pos, whence); + if (result >= 0) { + data->current = i; + while (i) + result += nodes[i--].size; + } + return result; +} + +URLProtocol concat_protocol = { + "concat", + concat_open, + concat_read, + NULL, + concat_seek, + concat_close, +};

2 1

r23363 - in trunk/libavcodec: h264.h h264_parser.c
by subversion＠mplayerhq.hu 15 Sep '10

15 Sep '10

Author: hyc Date: Fri May 28 20:50:39 2010 New Revision: 23363 Log: Parse avctx->extradata if available. Fixes many "non-existing PPS referenced" error messages Modified: trunk/libavcodec/h264.h trunk/libavcodec/h264_parser.c Modified: trunk/libavcodec/h264.h ============================================================================== --- trunk/libavcodec/h264.h Fri May 28 20:21:57 2010 (r23362) +++ trunk/libavcodec/h264.h Fri May 28 20:50:39 2010 (r23363) @@ -465,6 +465,7 @@ typedef struct H264Context{ int is_avc; ///< this flag is != 0 if codec is avc1 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) + int first_picture; SPS *sps_buffers[MAX_SPS_COUNT]; PPS *pps_buffers[MAX_PPS_COUNT]; Modified: trunk/libavcodec/h264_parser.c ============================================================================== --- trunk/libavcodec/h264_parser.c Fri May 28 20:21:57 2010 (r23362) +++ trunk/libavcodec/h264_parser.c Fri May 28 20:50:39 2010 (r23363) @@ -245,6 +245,14 @@ static int h264_parse(AVCodecParserConte ParseContext *pc = &h->s.parse_context; int next; + if (h->first_picture) { + h->first_picture = 0; + if (avctx->extradata_size) { + h->s.avctx = avctx; + ff_h264_decode_extradata(h); + } + } + if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ next= buf_size; }else{ @@ -319,6 +327,7 @@ static int init(AVCodecParserContext *s) { H264Context *h = s->priv_data; h->thread_context[0] = h; + h->first_picture = 1; return 0; }

2 1

r23039 - in trunk/libavfilter: vsrc_buffer.c vsrc_buffer.h
by subversion＠mplayerhq.hu 18 Jul '10

18 Jul '10

Author: michael Date: Fri May 7 03:25:00 2010 New Revision: 23039 Log: Add "Memory buffer source filter" from SOC. This is needed by the current SOC-ffmpeg.c code. Added: trunk/libavfilter/vsrc_buffer.c trunk/libavfilter/vsrc_buffer.h Added: trunk/libavfilter/vsrc_buffer.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavfilter/vsrc_buffer.c Fri May 7 03:25:00 2010 (r23039) @@ -0,0 +1,140 @@ +/* + * Memory buffer source filter + * Copyright (c) 2008 Vitor Sessak + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avfilter.h" +#include "vsrc_buffer.h" + +typedef struct { + int64_t pts; + AVFrame frame; + int has_frame; + int h, w, pix_fmt; + AVRational pixel_aspect; +} BufferSourceContext; + + +int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, + int64_t pts, AVRational pixel_aspect) +{ + BufferSourceContext *c = buffer_filter->priv; + + if (c->has_frame) { + av_log(buffer_filter, AV_LOG_ERROR, + "Buffering several frames is not supported. " + "Please consume all available frames before adding a new one.\n" + ); + //return -1; + } + + memcpy(c->frame.data , frame->data , sizeof(frame->data)); + memcpy(c->frame.linesize, frame->linesize, sizeof(frame->linesize)); + c->pts = pts; + c->pixel_aspect = pixel_aspect; + c->has_frame = 1; + + return 0; +} + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + BufferSourceContext *c = ctx->priv; + + if(args && sscanf(args, "%d:%d:%d", &c->w, &c->h, &c->pix_fmt) == 3) + return 0; + + av_log(ctx, AV_LOG_ERROR, "init() expected 3 arguments:'%s'\n", args); + return -1; +} + +static int query_formats(AVFilterContext *ctx) +{ + BufferSourceContext *c = ctx->priv; + enum PixelFormat pix_fmts[] = { c->pix_fmt, PIX_FMT_NONE }; + + avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int config_props(AVFilterLink *link) +{ + BufferSourceContext *c = link->src->priv; + + link->w = c->w; + link->h = c->h; + + return 0; +} + + +static int request_frame(AVFilterLink *link) +{ + BufferSourceContext *c = link->src->priv; + AVFilterPicRef *picref; + + if (!c->has_frame) { + av_log(link->src, AV_LOG_ERROR, + "request_frame() called with no available frame!\n"); + //return -1; + } + + /* This picture will be needed unmodified later for decoding the next + * frame */ + picref = avfilter_get_video_buffer(link, AV_PERM_WRITE | AV_PERM_PRESERVE | + AV_PERM_REUSE2, + link->w, link->h); + + av_picture_copy((AVPicture *)&picref->data, (AVPicture *)&c->frame, + picref->pic->format, link->w, link->h); + + picref->pts = c->pts; + picref->pixel_aspect = c->pixel_aspect; + avfilter_start_frame(link, avfilter_ref_pic(picref, ~0)); + avfilter_draw_slice(link, 0, link->h, 1); + avfilter_end_frame(link); + avfilter_unref_pic(picref); + + c->has_frame = 0; + + return 0; +} + +static int poll_frame(AVFilterLink *link) +{ + BufferSourceContext *c = link->src->priv; + return !!(c->has_frame); +} + +AVFilter avfilter_vsrc_buffer = +{ + .name = "buffer", + .priv_size = sizeof(BufferSourceContext), + .query_formats = query_formats, + + .init = init, + + .inputs = (AVFilterPad[]) {{ .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = request_frame, + .poll_frame = poll_frame, + .config_props = config_props, }, + { .name = NULL}}, +}; Added: trunk/libavfilter/vsrc_buffer.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libavfilter/vsrc_buffer.h Fri May 7 03:25:00 2010 (r23039) @@ -0,0 +1,24 @@ +/* + * Memory buffer source filter + * Copyright (c) 2008 Vitor Sessak + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, + int64_t pts, AVRational pixel_aspect); +

4 9

r19609 - in trunk: common.mak configure
by subversion＠mplayerhq.hu 18 Jul '10

18 Jul '10

Author: mru Date: Sat Aug 8 20:27:27 2009 New Revision: 19609 Log: Generate dependencies while compiling if supported by compiler Modified: trunk/common.mak trunk/configure Modified: trunk/common.mak ============================================================================== --- trunk/common.mak Sat Aug 8 20:27:22 2009 (r19608) +++ trunk/common.mak Sat Aug 8 20:27:27 2009 (r19609) @@ -21,12 +21,12 @@ ALLFFLIBS = avcodec avdevice avfilter av CPPFLAGS := -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) $(CPPFLAGS) %.o: %.c - $(DEPEND_CMD) - $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $< + $(CCDEP) + $(CC) $(CPPFLAGS) $(CFLAGS) $(CC_DEPFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $< %.o: %.S - $(DEPEND_CMD) - $(AS) $(CPPFLAGS) $(ASFLAGS) $(LIBOBJFLAGS) -c -o $@ $< + $(ASDEP) + $(AS) $(CPPFLAGS) $(ASFLAGS) $(AS_DEPFLAGS) $(LIBOBJFLAGS) -c -o $@ $< %.ho: %.h $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -Wno-unused -c -o $@ -x c $< Modified: trunk/configure ============================================================================== --- trunk/configure Sat Aug 8 20:27:22 2009 (r19608) +++ trunk/configure Sat Aug 8 20:27:27 2009 (r19609) @@ -1510,8 +1510,12 @@ filter_asflags=echo if $cc --version 2>/dev/null | grep -qi gcc; then cc_type=gcc + CC_DEPFLAGS='-MMD' + AS_DEPFLAGS='-MMD' elif $cc --version 2>/dev/null | grep -q Intel; then cc_type=icc + CC_DEPFLAGS='-MMD' + AS_DEPFLAGS='-MMD' elif $cc -v 2>&1 | grep -q xlc; then cc_type=xlc elif $cc -V 2>/dev/null | grep -q Compaq; then @@ -1530,17 +1534,19 @@ elif $cc --vsn 2>/dev/null | grep -q RVC die "Error creating armcc configuration file." cc="$cc --arm_linux_config_file=$armcc_conf --translate_gcc" as_default="${cross_prefix}gcc" + CC_DEPFLAGS='-MMD' + AS_DEPFLAGS='-MMD' elif $cc -version 2>/dev/null | grep -q TMS470; then cc_type=tms470 cc="$cc --gcc --abi=eabi -eo=.o -mc -me" CC_O='-fr=$(@D)' as_default="${cross_prefix}gcc" ld_default="${cross_prefix}gcc" - dep_cc_default="${cross_prefix}gcc" TMPO=$(basename $TMPC .c).o append TMPFILES $TMPO add_cflags -D__gnuc_va_list=va_list -D__USER_LABEL_PREFIX__= - DEPFLAGS='$(CPPFLAGS) -MM' + CC_DEPFLAGS='-ppa -ppd=$(@:.o=.d)' + AS_DEPFLAGS='-MMD' filter_cflags=tms470_flags tms470_flags(){ for flag; do @@ -1574,6 +1580,9 @@ test -n "$cc_type" && enable $cc_type || : ${ld_default:=$cc} set_default as dep_cc ld +test -n "$CC_DEPFLAGS" || CCDEP=$DEPEND_CMD +test -n "$AS_DEPFLAGS" || ASDEP=$DEPEND_CMD + add_cflags $extra_cflags add_asflags $extra_cflags @@ -2611,8 +2620,11 @@ echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBSUF=$SLIBSUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak echo "EXTRA_VERSION=$extra_version" >> config.mak -echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak echo "DEPFLAGS=$DEPFLAGS" >> config.mak +echo "CCDEP=$CCDEP" >> config.mak +echo "ASDEP=$ASDEP" >> config.mak +echo "CC_DEPFLAGS=$CC_DEPFLAGS" >> config.mak +echo "AS_DEPFLAGS=$AS_DEPFLAGS" >> config.mak echo "HOSTCC=$host_cc" >> config.mak echo "HOSTCFLAGS=$host_cflags" >> config.mak echo "HOSTEXESUF=$HOSTEXESUF" >> config.mak

5 4

r23030 - trunk/libavcodec/libschroedingerenc.c
by subversion＠mplayerhq.hu 17 Jul '10

17 Jul '10

Author: conrad Date: Wed May 5 23:38:02 2010 New Revision: 23030 Log: schroenc: Set colorspace info Modified: trunk/libavcodec/libschroedingerenc.c Modified: trunk/libavcodec/libschroedingerenc.c ============================================================================== --- trunk/libavcodec/libschroedingerenc.c Wed May 5 23:37:58 2010 (r23029) +++ trunk/libavcodec/libschroedingerenc.c Wed May 5 23:38:02 2010 (r23030) @@ -128,6 +128,24 @@ static int libschroedinger_encode_init(A if (SetSchroChromaFormat(avccontext) == -1) return -1; + if (avccontext->color_primaries == AVCOL_PRI_BT709) { + p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_HDTV; + } else if (avccontext->color_primaries == AVCOL_PRI_BT470BG) { + p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_SDTV_625; + } else if (avccontext->color_primaries == AVCOL_PRI_SMPTE170M) { + p_schro_params->format->colour_primaries = SCHRO_COLOUR_PRIMARY_SDTV_525; + } + + if (avccontext->colorspace == AVCOL_SPC_BT709) { + p_schro_params->format->colour_matrix = SCHRO_COLOUR_MATRIX_HDTV; + } else if (avccontext->colorspace == AVCOL_SPC_BT470BG) { + p_schro_params->format->colour_matrix = SCHRO_COLOUR_MATRIX_SDTV; + } + + if (avccontext->color_trc == AVCOL_TRC_BT709) { + p_schro_params->format->transfer_function = SCHRO_TRANSFER_CHAR_TV_GAMMA; + } + if (ff_get_schro_frame_format(p_schro_params->format->chroma_format, &p_schro_params->frame_format) == -1) { av_log(avccontext, AV_LOG_ERROR,

2 2