August 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

r24645 - in trunk: Makefile tests/lavfi-regression.sh
by subversion＠mplayerhq.hu 29 Dec '10

29 Dec '10

Author: stefano Date: Sun Aug 1 12:27:04 2010 New Revision: 24645 Log: Fix fate-lavfi-pixfmts test cross-compilation. Add the lavfi-showfiltfmts dependency in the Makefile, and correctly use the $target_exec and $target_path variables for invoking the lavfi-showfiltfmts tool. Modified: trunk/Makefile trunk/tests/lavfi-regression.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/Makefile Sun Aug 1 12:27:04 2010 (r24645) @@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.p tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + include $(SRC_PATH_BARE)/tests/fate.mak include $(SRC_PATH_BARE)/tests/fate2.mak @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC) $(FATE_ACODEC): $(AREF) $(FATE_VCODEC): $(VREF) $(FATE_LAVF): $(REFS) -$(FATE_LAVFI): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec Modified: trunk/tests/lavfi-regression.sh ============================================================================== --- trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:04 2010 (r24645) @@ -66,15 +66,16 @@ vflip " if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then + showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" # exclude pixel formats which are not supported as input excluded_pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)" - scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) + scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts") for filter_args in $filters_args; do filter=$(echo $filter_args | sed -e 's/$[^=]\+$=.*/\1/') - in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) + in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts") for pix_fmt in $pix_fmts; do

3 2

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

r24926 - trunk/libavcodec/x86/vp56dsp.asm
by subversion＠mplayerhq.hu 06 Sep '10

06 Sep '10

Author: mru Date: Wed Aug 25 17:41:11 2010 New Revision: 24926 Log: VP6: fix vp6_filter_diag4_mmx/sse on 64-bit The stride can be negative and must be sign extended before being used in pointer arithmetic. Modified: trunk/libavcodec/x86/vp56dsp.asm Modified: trunk/libavcodec/x86/vp56dsp.asm ============================================================================== --- trunk/libavcodec/x86/vp56dsp.asm Wed Aug 25 17:32:29 2010 (r24925) +++ trunk/libavcodec/x86/vp56dsp.asm Wed Aug 25 17:41:11 2010 (r24926) @@ -127,6 +127,9 @@ cglobal vp6_filter_diag4_%1, 5, 7, %2 sub rsp, 8*15 movq m6, [pw_64] %endif +%ifdef ARCH_X86_64 + movsxd r2, r2d +%endif sub r1, r2

8 31

r32011 - in trunk/libswscale: swscale.c swscale_template.c
by subversion＠mplayerhq.hu 06 Sep '10

06 Sep '10

Author: mru Date: Mon Aug 23 23:22:24 2010 New Revision: 32011 Log: swscale: fix unaligned accesses in (RGB|BGR)32_1 to YUV conversion Modified: trunk/libswscale/swscale.c trunk/libswscale/swscale_template.c Modified: trunk/libswscale/swscale.c ============================================================================== --- trunk/libswscale/swscale.c Mon Aug 23 23:22:20 2010 (r32010) +++ trunk/libswscale/swscale.c Mon Aug 23 23:22:24 2010 (r32011) @@ -1048,7 +1048,9 @@ static inline void name(uint8_t *dst, co } BGR2Y(uint32_t, bgr32ToY,16, 0, 0, 0x00FF, 0xFF00, 0x00FF, RY<< 8, GY , BY<< 8, RGB2YUV_SHIFT+8) +BGR2Y(uint32_t,bgr321ToY,16,16, 0, 0xFF00, 0x00FF, 0xFF00, RY , GY<<8, BY , RGB2YUV_SHIFT+8) BGR2Y(uint32_t, rgb32ToY, 0, 0,16, 0x00FF, 0xFF00, 0x00FF, RY<< 8, GY , BY<< 8, RGB2YUV_SHIFT+8) +BGR2Y(uint32_t,rgb321ToY, 0,16,16, 0xFF00, 0x00FF, 0xFF00, RY , GY<<8, BY , RGB2YUV_SHIFT+8) BGR2Y(uint16_t, bgr16ToY, 0, 0, 0, 0x001F, 0x07E0, 0xF800, RY<<11, GY<<5, BY , RGB2YUV_SHIFT+8) BGR2Y(uint16_t, bgr15ToY, 0, 0, 0, 0x001F, 0x03E0, 0x7C00, RY<<10, GY<<5, BY , RGB2YUV_SHIFT+7) BGR2Y(uint16_t, rgb16ToY, 0, 0, 0, 0xF800, 0x07E0, 0x001F, RY , GY<<5, BY<<11, RGB2YUV_SHIFT+8) @@ -1062,14 +1064,14 @@ static inline void abgrToA(uint8_t *dst, } } -#define BGR2UV(type, name, shr, shg, shb, maskr, maskg, maskb, RU, GU, BU, RV, GV, BV, S)\ +#define BGR2UV(type, name, shr, shg, shb, shp, maskr, maskg, maskb, RU, GU, BU, RV, GV, BV, S) \ static inline void name(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, long width, uint32_t *unused)\ {\ int i;\ for (i=0; i<width; i++) {\ - int b= (((const type*)src)[i]&maskb)>>shb;\ - int g= (((const type*)src)[i]&maskg)>>shg;\ - int r= (((const type*)src)[i]&maskr)>>shr;\ + int b= (((const type*)src)[i]&maskb)>>(shb+shp);\ + int g= (((const type*)src)[i]&maskg)>>(shg+shp);\ + int r= (((const type*)src)[i]&maskr)>>(shr+shp);\ \ dstU[i]= ((RU)*r + (GU)*g + (BU)*b + (257<<((S)-1)))>>(S);\ dstV[i]= ((RV)*r + (GV)*g + (BV)*b + (257<<((S)-1)))>>(S);\ @@ -1079,8 +1081,8 @@ static inline void name ## _half(uint8_t {\ int i;\ for (i=0; i<width; i++) {\ - int pix0= ((const type*)src)[2*i+0];\ - int pix1= ((const type*)src)[2*i+1];\ + int pix0= ((const type*)src)[2*i+0]>>shp;\ + int pix1= ((const type*)src)[2*i+1]>>shp;\ int g= (pix0&~(maskr|maskb))+(pix1&~(maskr|maskb));\ int b= ((pix0+pix1-g)&(maskb|(2*maskb)))>>shb;\ int r= ((pix0+pix1-g)&(maskr|(2*maskr)))>>shr;\ @@ -1093,12 +1095,14 @@ static inline void name ## _half(uint8_t }\ } -BGR2UV(uint32_t, bgr32ToUV,16, 0, 0, 0xFF0000, 0xFF00, 0x00FF, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) -BGR2UV(uint32_t, rgb32ToUV, 0, 0,16, 0x00FF, 0xFF00, 0xFF0000, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) -BGR2UV(uint16_t, bgr16ToUV, 0, 0, 0, 0x001F, 0x07E0, 0xF800, RU<<11, GU<<5, BU , RV<<11, GV<<5, BV , RGB2YUV_SHIFT+8) -BGR2UV(uint16_t, bgr15ToUV, 0, 0, 0, 0x001F, 0x03E0, 0x7C00, RU<<10, GU<<5, BU , RV<<10, GV<<5, BV , RGB2YUV_SHIFT+7) -BGR2UV(uint16_t, rgb16ToUV, 0, 0, 0, 0xF800, 0x07E0, 0x001F, RU , GU<<5, BU<<11, RV , GV<<5, BV<<11, RGB2YUV_SHIFT+8) -BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RU , GU<<5, BU<<10, RV , GV<<5, BV<<10, RGB2YUV_SHIFT+7) +BGR2UV(uint32_t, bgr32ToUV,16, 0, 0, 0, 0xFF0000, 0xFF00, 0x00FF, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) +BGR2UV(uint32_t,bgr321ToUV,16, 0, 0, 8, 0xFF0000, 0xFF00, 0x00FF, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) +BGR2UV(uint32_t, rgb32ToUV, 0, 0,16, 0, 0x00FF, 0xFF00, 0xFF0000, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) +BGR2UV(uint32_t,rgb321ToUV, 0, 0,16, 8, 0x00FF, 0xFF00, 0xFF0000, RU<< 8, GU , BU<< 8, RV<< 8, GV , BV<< 8, RGB2YUV_SHIFT+8) +BGR2UV(uint16_t, bgr16ToUV, 0, 0, 0, 0, 0x001F, 0x07E0, 0xF800, RU<<11, GU<<5, BU , RV<<11, GV<<5, BV , RGB2YUV_SHIFT+8) +BGR2UV(uint16_t, bgr15ToUV, 0, 0, 0, 0, 0x001F, 0x03E0, 0x7C00, RU<<10, GU<<5, BU , RV<<10, GV<<5, BV , RGB2YUV_SHIFT+7) +BGR2UV(uint16_t, rgb16ToUV, 0, 0, 0, 0, 0xF800, 0x07E0, 0x001F, RU , GU<<5, BU<<11, RV , GV<<5, BV<<11, RGB2YUV_SHIFT+8) +BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RU , GU<<5, BU<<10, RV , GV<<5, BV<<10, RGB2YUV_SHIFT+7) static inline void palToY(uint8_t *dst, const uint8_t *src, long width, uint32_t *pal) { Modified: trunk/libswscale/swscale_template.c ============================================================================== --- trunk/libswscale/swscale_template.c Mon Aug 23 23:22:20 2010 (r32010) +++ trunk/libswscale/swscale_template.c Mon Aug 23 23:22:24 2010 (r32011) @@ -2966,13 +2966,13 @@ static void RENAME(sws_init_swScale)(Sws switch(srcFormat) { case PIX_FMT_RGB48BE: case PIX_FMT_RGB48LE: c->chrToYV12 = rgb48ToUV_half; break; - case PIX_FMT_RGB32 : - case PIX_FMT_RGB32_1: c->chrToYV12 = bgr32ToUV_half; break; + case PIX_FMT_RGB32 : c->chrToYV12 = bgr32ToUV_half; break; + case PIX_FMT_RGB32_1: c->chrToYV12 = bgr321ToUV_half; break; case PIX_FMT_BGR24 : c->chrToYV12 = RENAME(bgr24ToUV_half); break; case PIX_FMT_BGR565 : c->chrToYV12 = bgr16ToUV_half; break; case PIX_FMT_BGR555 : c->chrToYV12 = bgr15ToUV_half; break; - case PIX_FMT_BGR32 : - case PIX_FMT_BGR32_1: c->chrToYV12 = rgb32ToUV_half; break; + case PIX_FMT_BGR32 : c->chrToYV12 = rgb32ToUV_half; break; + case PIX_FMT_BGR32_1: c->chrToYV12 = rgb321ToUV_half; break; case PIX_FMT_RGB24 : c->chrToYV12 = RENAME(rgb24ToUV_half); break; case PIX_FMT_RGB565 : c->chrToYV12 = rgb16ToUV_half; break; case PIX_FMT_RGB555 : c->chrToYV12 = rgb15ToUV_half; break; @@ -2981,13 +2981,13 @@ static void RENAME(sws_init_swScale)(Sws switch(srcFormat) { case PIX_FMT_RGB48BE: case PIX_FMT_RGB48LE: c->chrToYV12 = rgb48ToUV; break; - case PIX_FMT_RGB32 : - case PIX_FMT_RGB32_1: c->chrToYV12 = bgr32ToUV; break; + case PIX_FMT_RGB32 : c->chrToYV12 = bgr32ToUV; break; + case PIX_FMT_RGB32_1: c->chrToYV12 = bgr321ToUV; break; case PIX_FMT_BGR24 : c->chrToYV12 = RENAME(bgr24ToUV); break; case PIX_FMT_BGR565 : c->chrToYV12 = bgr16ToUV; break; case PIX_FMT_BGR555 : c->chrToYV12 = bgr15ToUV; break; - case PIX_FMT_BGR32 : - case PIX_FMT_BGR32_1: c->chrToYV12 = rgb32ToUV; break; + case PIX_FMT_BGR32 : c->chrToYV12 = rgb32ToUV; break; + case PIX_FMT_BGR32_1: c->chrToYV12 = rgb321ToUV; break; case PIX_FMT_RGB24 : c->chrToYV12 = RENAME(rgb24ToUV); break; case PIX_FMT_RGB565 : c->chrToYV12 = rgb16ToUV; break; case PIX_FMT_RGB555 : c->chrToYV12 = rgb15ToUV; break; @@ -3020,10 +3020,10 @@ static void RENAME(sws_init_swScale)(Sws case PIX_FMT_RGB4_BYTE: c->lumToYV12 = palToY; break; case PIX_FMT_MONOBLACK: c->lumToYV12 = monoblack2Y; break; case PIX_FMT_MONOWHITE: c->lumToYV12 = monowhite2Y; break; - case PIX_FMT_RGB32 : - case PIX_FMT_RGB32_1: c->lumToYV12 = bgr32ToY; break; - case PIX_FMT_BGR32 : - case PIX_FMT_BGR32_1: c->lumToYV12 = rgb32ToY; break; + case PIX_FMT_RGB32 : c->lumToYV12 = bgr32ToY; break; + case PIX_FMT_RGB32_1: c->lumToYV12 = bgr321ToY; break; + case PIX_FMT_BGR32 : c->lumToYV12 = rgb32ToY; break; + case PIX_FMT_BGR32_1: c->lumToYV12 = rgb321ToY; break; case PIX_FMT_RGB48BE: case PIX_FMT_RGB48LE: c->lumToYV12 = rgb48ToY; break; } @@ -3041,11 +3041,6 @@ static void RENAME(sws_init_swScale)(Sws case PIX_FMT_BGR32 : c->alpSrcOffset = 3; break; - case PIX_FMT_RGB32_1: - case PIX_FMT_BGR32_1: - c->lumSrcOffset = ALT32_CORR; - c->chrSrcOffset = ALT32_CORR; - break; case PIX_FMT_RGB48LE: c->lumSrcOffset = 1; c->chrSrcOffset = 1;

3 5