February 2010 - ffmpeg-cvslog

r22118 - trunk/libavcodec/resample2.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 20:58:26 2010 New Revision: 22118 Log: Make av_build_filter static (and remove av_): It is not used outside resample2.c. Modified: trunk/libavcodec/resample2.c Modified: trunk/libavcodec/resample2.c ============================================================================== --- trunk/libavcodec/resample2.c Sun Feb 28 20:05:51 2010 (r22117) +++ trunk/libavcodec/resample2.c Sun Feb 28 20:58:26 2010 (r22118) @@ -95,7 +95,7 @@ static double bessel(double x){ * @param scale wanted sum of coefficients for each filter * @param type 0->cubic, 1->blackman nuttall windowed sinc, 2..16->kaiser windowed sinc beta=2..16 */ -void av_build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){ +static void build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){ int ph, i; double x, y, w, tab[tap_count]; const int center= (tap_count-1)/2; @@ -189,7 +189,7 @@ AVResampleContext *av_resample_init(int c->filter_length= FFMAX((int)ceil(filter_size/factor), 1); c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); - av_build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE); + build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE); memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1];

1 0

r22117 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 20:05:51 2010 New Revision: 22117 Log: Make av_get_bit_rate() static and remove av_, the function is only used inside libavcodec/utils.c. Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Sun Feb 28 20:03:38 2010 (r22116) +++ trunk/libavcodec/utils.c Sun Feb 28 20:05:51 2010 (r22117) @@ -769,7 +769,7 @@ AVCodec *avcodec_find_decoder_by_name(co return NULL; } -int av_get_bit_rate(AVCodecContext *ctx) +static int get_bit_rate(AVCodecContext *ctx) { int bit_rate; int bits_per_sample; @@ -907,7 +907,7 @@ void avcodec_string(char *buf, int buf_s snprintf(buf + strlen(buf), buf_size - strlen(buf), ", pass 2"); } - bitrate = av_get_bit_rate(enc); + bitrate = get_bit_rate(enc); if (bitrate != 0) { snprintf(buf + strlen(buf), buf_size - strlen(buf), ", %d kb/s", bitrate / 1000);

1 0

r22116 - trunk/libavcodec/utils.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 20:03:38 2010 New Revision: 22116 Log: Include libxvid_internal.h: It contains the prototype for av_tempfile(). Modified: trunk/libavcodec/utils.c Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Sun Feb 28 19:57:18 2010 (r22115) +++ trunk/libavcodec/utils.c Sun Feb 28 20:03:38 2010 (r22116) @@ -37,6 +37,7 @@ #include "opt.h" #include "imgconvert.h" #include "audioconvert.h" +#include "libxvid_internal.h" #include "internal.h" #include <stdlib.h> #include <stdarg.h>

1 0

r22115 - trunk/libavcodec/libxvidff.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 19:57:18 2010 New Revision: 22115 Log: Make the following functions static (and remove ff_), they are only used inside libxvidff.c: ff_xvid_encode_init(), ff_xvid_encode_frame(), ff_xvid_encode_close() Modified: trunk/libavcodec/libxvidff.c Modified: trunk/libavcodec/libxvidff.c ============================================================================== --- trunk/libavcodec/libxvidff.c Sun Feb 28 19:50:56 2010 (r22114) +++ trunk/libavcodec/libxvidff.c Sun Feb 28 19:57:18 2010 (r22115) @@ -82,7 +82,7 @@ void xvid_correct_framerate(AVCodecConte * @param avctx AVCodecContext pointer to context * @return Returns 0 on success, -1 on failure */ -av_cold int ff_xvid_encode_init(AVCodecContext *avctx) { +static av_cold int xvid_encode_init(AVCodecContext *avctx) { int xerr, i; int xvid_flags = avctx->flags; struct xvid_context *x = avctx->priv_data; @@ -367,7 +367,7 @@ av_cold int ff_xvid_encode_init(AVCodecC * @param data Pointer to AVFrame of unencoded frame * @return Returns 0 on success, -1 on failure */ -int ff_xvid_encode_frame(AVCodecContext *avctx, +static int xvid_encode_frame(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) { int xerr, i; char *tmp; @@ -475,7 +475,7 @@ int ff_xvid_encode_frame(AVCodecContext * @param avctx AVCodecContext pointer to context * @return Returns 0, success guaranteed */ -av_cold int ff_xvid_encode_close(AVCodecContext *avctx) { +static av_cold int xvid_encode_close(AVCodecContext *avctx) { struct xvid_context *x = avctx->priv_data; xvid_encore(x->encoder_handle, XVID_ENC_DESTROY, NULL, NULL); @@ -772,9 +772,9 @@ AVCodec libxvid_encoder = { CODEC_TYPE_VIDEO, CODEC_ID_XVID, sizeof(struct xvid_context), - ff_xvid_encode_init, - ff_xvid_encode_frame, - ff_xvid_encode_close, + xvid_encode_init, + xvid_encode_frame, + xvid_encode_close, .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), };

1 0

r22114 - trunk/libavcodec/audioconvert.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 19:50:56 2010 New Revision: 22114 Log: Make function get_channel_name() static: It is only used in audioconvert.c. Modified: trunk/libavcodec/audioconvert.c Modified: trunk/libavcodec/audioconvert.c ============================================================================== --- trunk/libavcodec/audioconvert.c Sun Feb 28 19:37:09 2010 (r22113) +++ trunk/libavcodec/audioconvert.c Sun Feb 28 19:50:56 2010 (r22114) @@ -79,7 +79,7 @@ static const char* const channel_names[] [30] = "DR", }; -const char *get_channel_name(int channel_id) +static const char *get_channel_name(int channel_id) { if (channel_id<0 || channel_id>=FF_ARRAY_ELEMS(channel_names)) return NULL;

1 0

r22113 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 19:37:09 2010 New Revision: 22113 Log: Print chapter info in dump_format(). Patch by Anton Khirnov, wyskas gmail Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c Sun Feb 28 19:33:33 2010 (r22112) +++ trunk/libavformat/utils.c Sun Feb 28 19:37:09 2010 (r22113) @@ -3009,6 +3009,14 @@ void dump_format(AVFormatContext *ic, } av_log(NULL, AV_LOG_INFO, "\n"); } + for (i = 0; i < ic->nb_chapters; i++) { + AVChapter *ch = ic->chapters[i]; + av_log(NULL, AV_LOG_INFO, " Chapter #%d.%d: ", index, i); + av_log(NULL, AV_LOG_INFO, "start %f, ", ch->start * av_q2d(ch->time_base)); + av_log(NULL, AV_LOG_INFO, "end %f\n", ch->end * av_q2d(ch->time_base)); + + dump_metadata(NULL, ch->metadata, " "); + } if(ic->nb_programs) { int j, k, total = 0; for(j=0; j<ic->nb_programs; j++) {

1 0

r22111 - trunk/libavformat/mp3.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: michael Date: Sun Feb 28 17:40:17 2010 New Revision: 22111 Log: Many mp3s seem to contain padding after id3 tags that is not considered in the tag size. Skip this to make the format probing quicker. Modified: trunk/libavformat/mp3.c Modified: trunk/libavformat/mp3.c ============================================================================== --- trunk/libavformat/mp3.c Sun Feb 28 12:18:04 2010 (r22110) +++ trunk/libavformat/mp3.c Sun Feb 28 17:40:17 2010 (r22111) @@ -45,10 +45,12 @@ static int mp3_read_probe(AVProbeData *p if(ff_id3v2_match(buf0)) { buf0 += ff_id3v2_tag_len(buf0); } + end = p->buf + p->buf_size - sizeof(uint32_t); + while(buf0 < end && !*buf0) + buf0++; max_frames = 0; buf = buf0; - end = p->buf + p->buf_size - sizeof(uint32_t); for(; buf < end; buf= buf2+1) { buf2 = buf;

1 0

r22110 - trunk/tests/seek_test.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: reimar Date: Sun Feb 28 12:18:04 2010 New Revision: 22110 Log: Free packets read in seek_test. Modified: trunk/tests/seek_test.c Modified: trunk/tests/seek_test.c ============================================================================== --- trunk/tests/seek_test.c Sun Feb 28 12:03:14 2010 (r22109) +++ trunk/tests/seek_test.c Sun Feb 28 12:18:04 2010 (r22110) @@ -105,6 +105,7 @@ int main(int argc, char **argv) ts_str(dts_buf, pkt.dts, st->time_base); ts_str(ts_buf, pkt.pts, st->time_base); printf("ret:%-10s st:%2d flags:%d dts:%s pts:%s pos:%7" PRId64 " size:%6d", ret_str(ret), pkt.stream_index, pkt.flags, dts_buf, ts_buf, pkt.pos, pkt.size); + av_free_packet(&pkt); } else printf("ret:%s", ret_str(ret)); // necessary to avoid trailing whitespace printf("\n");

1 0

r22109 - in trunk/libavformat: Makefile rtp_asf.c rtp_asf.h rtp_h264.c rtp_h264.h rtp_vorbis.c rtp_vorbis.h rtpdec.c rtpdec_asf.c rtpdec_asf.h rtpdec_h264.c rtpdec_h264.h rtpdec_vorbis.c rtpdec_vor...
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: mstorsjo Date: Sun Feb 28 12:03:14 2010 New Revision: 22109 Log: Rename RTP depacketizer files from rtp_* to rtpdec_* Added: trunk/libavformat/rtpdec_asf.c - copied, changed from r22107, trunk/libavformat/rtp_asf.c trunk/libavformat/rtpdec_asf.h - copied, changed from r22107, trunk/libavformat/rtp_asf.h trunk/libavformat/rtpdec_h264.c - copied, changed from r22107, trunk/libavformat/rtp_h264.c trunk/libavformat/rtpdec_h264.h - copied, changed from r22107, trunk/libavformat/rtp_h264.h trunk/libavformat/rtpdec_vorbis.c - copied, changed from r22107, trunk/libavformat/rtp_vorbis.c trunk/libavformat/rtpdec_vorbis.h - copied, changed from r22107, trunk/libavformat/rtp_vorbis.h Deleted: trunk/libavformat/rtp_asf.c trunk/libavformat/rtp_asf.h trunk/libavformat/rtp_h264.c trunk/libavformat/rtp_h264.h trunk/libavformat/rtp_vorbis.c trunk/libavformat/rtp_vorbis.h Modified: trunk/libavformat/Makefile trunk/libavformat/rtpdec.c trunk/libavformat/rtsp.c Modified: trunk/libavformat/Makefile ============================================================================== --- trunk/libavformat/Makefile Sun Feb 28 11:58:27 2010 (r22108) +++ trunk/libavformat/Makefile Sun Feb 28 12:03:14 2010 (r22109) @@ -216,10 +216,10 @@ OBJS-$(CONFIG_SDP_DEMUXER) rtp.o \ rtpdec.o \ rtpdec_amr.o \ + rtpdec_asf.o \ rtpdec_h263.o \ - rtp_asf.o \ - rtp_h264.o \ - rtp_vorbis.o + rtpdec_h264.o \ + rtpdec_vorbis.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o Modified: trunk/libavformat/rtpdec.c ============================================================================== --- trunk/libavformat/rtpdec.c Sun Feb 28 11:58:27 2010 (r22108) +++ trunk/libavformat/rtpdec.c Sun Feb 28 12:03:14 2010 (r22109) @@ -30,11 +30,11 @@ #include "network.h" #include "rtpdec.h" -#include "rtp_asf.h" -#include "rtp_h264.h" -#include "rtp_vorbis.h" #include "rtpdec_amr.h" +#include "rtpdec_asf.h" #include "rtpdec_h263.h" +#include "rtpdec_h264.h" +#include "rtpdec_vorbis.h" //#define DEBUG Copied and modified: trunk/libavformat/rtpdec_asf.c (from r22107, trunk/libavformat/rtp_asf.c) ============================================================================== --- trunk/libavformat/rtp_asf.c Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_asf.c Sun Feb 28 12:03:14 2010 (r22109) @@ -20,7 +20,7 @@ */ /** - * @file libavformat/rtp_asf.c + * @file libavformat/rtpdec_asf.c * @brief Microsoft RTP/ASF support * @author Ronald S. Bultje <rbultje at ronald.bitfreak.net> */ @@ -29,7 +29,7 @@ #include <libavutil/avstring.h> #include <libavutil/intreadwrite.h> #include "rtp.h" -#include "rtp_asf.h" +#include "rtpdec_asf.h" #include "rtsp.h" #include "asf.h" Copied and modified: trunk/libavformat/rtpdec_asf.h (from r22107, trunk/libavformat/rtp_asf.h) ============================================================================== --- trunk/libavformat/rtp_asf.h Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_asf.h Sun Feb 28 12:03:14 2010 (r22109) @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RTP_ASF_H -#define AVFORMAT_RTP_ASF_H +#ifndef AVFORMAT_RTPDEC_ASF_H +#define AVFORMAT_RTPDEC_ASF_H #include "avformat.h" #include "rtpdec.h" @@ -40,4 +40,4 @@ void ff_wms_parse_sdp_a_line(AVFormatCon extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfv_handler, ff_ms_rtp_asf_pfa_handler; -#endif /* AVFORMAT_RTP_ASF_H */ +#endif /* AVFORMAT_RTPDEC_ASF_H */ Copied and modified: trunk/libavformat/rtpdec_h264.c (from r22107, trunk/libavformat/rtp_h264.c) ============================================================================== --- trunk/libavformat/rtp_h264.c Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_h264.c Sun Feb 28 12:03:14 2010 (r22109) @@ -20,7 +20,7 @@ */ /** -* @file libavformat/rtp_h264.c +* @file libavformat/rtpdec_h264.c * @brief H.264 / RTP Code (RFC3984) * @author Ryan Martell <rdm4 at martellventures.com> * @@ -47,7 +47,7 @@ #include <assert.h> #include "rtpdec.h" -#include "rtp_h264.h" +#include "rtpdec_h264.h" /** RTP/H264 specific private data. Copied and modified: trunk/libavformat/rtpdec_h264.h (from r22107, trunk/libavformat/rtp_h264.h) ============================================================================== --- trunk/libavformat/rtp_h264.h Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_h264.h Sun Feb 28 12:03:14 2010 (r22109) @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RTP_H264_H -#define AVFORMAT_RTP_H264_H +#ifndef AVFORMAT_RTPDEC_H264_H +#define AVFORMAT_RTPDEC_H264_H #include "rtpdec.h" extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; -#endif /* AVFORMAT_RTP_H264_H */ +#endif /* AVFORMAT_RTPDEC_H264_H */ Copied and modified: trunk/libavformat/rtpdec_vorbis.c (from r22107, trunk/libavformat/rtp_vorbis.c) ============================================================================== --- trunk/libavformat/rtp_vorbis.c Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_vorbis.c Sun Feb 28 12:03:14 2010 (r22109) @@ -20,7 +20,7 @@ */ /** - * @file libavformat/rtp_vorbis.c + * @file libavformat/rtpdec_vorbis.c * @brief Vorbis / RTP Code (RFC 5215) * @author Colin McQuillan <m.niloc at gmail.com> */ @@ -32,7 +32,7 @@ #include <assert.h> #include "rtpdec.h" -#include "rtp_vorbis.h" +#include "rtpdec_vorbis.h" /** * RTP/Vorbis specific private data. Copied and modified: trunk/libavformat/rtpdec_vorbis.h (from r22107, trunk/libavformat/rtp_vorbis.h) ============================================================================== --- trunk/libavformat/rtp_vorbis.h Sun Feb 28 04:59:15 2010 (r22107, copy source) +++ trunk/libavformat/rtpdec_vorbis.h Sun Feb 28 12:03:14 2010 (r22109) @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RTP_VORBIS_H -#define AVFORMAT_RTP_VORBIS_H +#ifndef AVFORMAT_RTPDEC_VORBIS_H +#define AVFORMAT_RTPDEC_VORBIS_H #include "libavcodec/avcodec.h" #include "rtpdec.h" @@ -42,4 +42,4 @@ ff_vorbis_parse_fmtp_config(AVCodecConte */ extern RTPDynamicProtocolHandler ff_vorbis_dynamic_handler; -#endif /* AVFORMAT_RTP_VORBIS_H */ +#endif /* AVFORMAT_RTPDEC_VORBIS_H */ Modified: trunk/libavformat/rtsp.c ============================================================================== --- trunk/libavformat/rtsp.c Sun Feb 28 11:58:27 2010 (r22108) +++ trunk/libavformat/rtsp.c Sun Feb 28 12:03:14 2010 (r22109) @@ -37,8 +37,8 @@ #include "rtpdec.h" #include "rdt.h" -#include "rtp_asf.h" -#include "rtp_vorbis.h" +#include "rtpdec_asf.h" +#include "rtpdec_vorbis.h" //#define DEBUG //#define DEBUG_RTP_TCP

1 0

r22108 - trunk/tests/seek_test.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: reimar Date: Sun Feb 28 11:58:27 2010 New Revision: 22108 Log: Fix some memory leaks in seek_test test program: - do not allocate context twice - close the input file before exiting Modified: trunk/tests/seek_test.c Modified: trunk/tests/seek_test.c ============================================================================== --- trunk/tests/seek_test.c Sun Feb 28 04:59:15 2010 (r22107) +++ trunk/tests/seek_test.c Sun Feb 28 11:58:27 2010 (r22108) @@ -60,7 +60,7 @@ static void ts_str(char buffer[60], int6 int main(int argc, char **argv) { const char *filename; - AVFormatContext *ic; + AVFormatContext *ic = NULL; int i, ret, stream_id; int64_t timestamp; AVFormatParameters params, *ap= &params; @@ -79,13 +79,6 @@ int main(int argc, char **argv) filename = argv[1]; - /* allocate the media context */ - ic = avformat_alloc_context(); - if (!ic) { - fprintf(stderr, "Memory error\n"); - exit(1); - } - ret = av_open_input_file(&ic, filename, NULL, 0, ap); if (ret < 0) { fprintf(stderr, "cannot open %s\n", filename); @@ -132,5 +125,7 @@ int main(int argc, char **argv) printf("ret:%-10s st:%2d flags:%d ts:%s\n", ret_str(ret), stream_id, i&1, ts_buf); } + av_close_input_file(ic); + return 0; }

1 0

r22107 - trunk/libavformat/rtpproto.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:59:15 2010 New Revision: 22107 Log: Include rtpdec.h, it contains prototypes for the following functions: rtp_set_remote_url(), rtp_get_local_port(), rtp_get_file_handles() Modified: trunk/libavformat/rtpproto.c Modified: trunk/libavformat/rtpproto.c ============================================================================== --- trunk/libavformat/rtpproto.c Sun Feb 28 04:52:10 2010 (r22106) +++ trunk/libavformat/rtpproto.c Sun Feb 28 04:59:15 2010 (r22107) @@ -26,6 +26,7 @@ #include "libavutil/avstring.h" #include "avformat.h" +#include "rtpdec.h" #include <unistd.h> #include <stdarg.h>

1 0

r22106 - trunk/libavcodec/imgconvert.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:52:10 2010 New Revision: 22106 Log: Include internal.h and imgconvert.h, they contain the prototypes for the following functions: ff_is_hwaccel_pix_fmt(), ff_set_systematic_pal(), ff_fill_linesize(), ff_fill_pointer(), ff_get_plane_bytewidth() Modified: trunk/libavcodec/imgconvert.c Modified: trunk/libavcodec/imgconvert.c ============================================================================== --- trunk/libavcodec/imgconvert.c Sun Feb 28 04:41:59 2010 (r22105) +++ trunk/libavcodec/imgconvert.c Sun Feb 28 04:52:10 2010 (r22106) @@ -33,6 +33,8 @@ #include "avcodec.h" #include "dsputil.h" #include "colorspace.h" +#include "internal.h" +#include "imgconvert.h" #include "libavutil/pixdesc.h" #if HAVE_MMX

1 0

r22105 - trunk/libavcodec/msrledec.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:41:59 2010 New Revision: 22105 Log: Include msrledec.h: It contains the prototype for ff_msrle_decode(). Modified: trunk/libavcodec/msrledec.c Modified: trunk/libavcodec/msrledec.c ============================================================================== --- trunk/libavcodec/msrledec.c Sun Feb 28 04:39:11 2010 (r22104) +++ trunk/libavcodec/msrledec.c Sun Feb 28 04:41:59 2010 (r22105) @@ -28,6 +28,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "msrledec.h" #define FETCH_NEXT_STREAM_BYTE() \ if (stream_ptr >= data_size) \

1 0

r22104 - trunk/libavcodec/atrac.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:39:11 2010 New Revision: 22104 Log: Include atrac.h: It contains the prototypes for atrac_generate_tables() and atrac_iqmf(). Modified: trunk/libavcodec/atrac.c Modified: trunk/libavcodec/atrac.c ============================================================================== --- trunk/libavcodec/atrac.c Sun Feb 28 04:27:10 2010 (r22103) +++ trunk/libavcodec/atrac.c Sun Feb 28 04:39:11 2010 (r22104) @@ -30,6 +30,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "atrac.h" float sf_table[64]; float qmf_window[48];

1 0

r22103 - trunk/libavcodec/mpegaudiodecheader.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:27:10 2010 New Revision: 22103 Log: Include mpegaudiodecheader.h: It contains the prototype for ff_mpegaudio_decode_header(). Modified: trunk/libavcodec/mpegaudiodecheader.c Modified: trunk/libavcodec/mpegaudiodecheader.c ============================================================================== --- trunk/libavcodec/mpegaudiodecheader.c Sun Feb 28 04:02:25 2010 (r22102) +++ trunk/libavcodec/mpegaudiodecheader.c Sun Feb 28 04:27:10 2010 (r22103) @@ -28,6 +28,7 @@ #include "avcodec.h" #include "mpegaudio.h" #include "mpegaudiodata.h" +#include "mpegaudiodecheader.h" int ff_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header)

1 0

r22102 - trunk/libavcodec/vp3.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 04:02:25 2010 New Revision: 22102 Log: Remove declaration of unused variables. Modified: trunk/libavcodec/vp3.c Modified: trunk/libavcodec/vp3.c ============================================================================== --- trunk/libavcodec/vp3.c Sun Feb 28 03:44:36 2010 (r22101) +++ trunk/libavcodec/vp3.c Sun Feb 28 04:02:25 2010 (r22102) @@ -256,9 +256,6 @@ static int init_block_mapping(Vp3DecodeC int superblock_row_inc = 0; int mapping_index = 0; - int current_macroblock; - int c_fragment; - static const signed char travel_width[16] = { 1, 1, 0, -1, 0, 0, 1, 0, @@ -664,7 +661,6 @@ static int unpack_modes(Vp3DecodeContext for (j = 0; j < 4; j++) { int mb_x = 2*sb_x + (j>>1); int mb_y = 2*sb_y + (((j>>1)+j)&1); - int frags_coded = 0; current_macroblock = mb_y * s->macroblock_width + mb_x; if (mb_x >= s->macroblock_width || mb_y >= s->macroblock_height)

1 0

r22101 - trunk/libavcodec/h263_parser.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 03:44:36 2010 New Revision: 22101 Log: Include h263_parser.h: It contains the prototype for ff_h263_find_frame_end(). Modified: trunk/libavcodec/h263_parser.c Modified: trunk/libavcodec/h263_parser.c ============================================================================== --- trunk/libavcodec/h263_parser.c Sun Feb 28 03:41:20 2010 (r22100) +++ trunk/libavcodec/h263_parser.c Sun Feb 28 03:44:36 2010 (r22101) @@ -25,6 +25,7 @@ */ #include "parser.h" +#include "h263_parser.h" int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ int vop_found, i;

1 0

r22100 - trunk/libavcodec/mpeg4video_parser.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 03:41:20 2010 New Revision: 22100 Log: Include mpeg4video.h: Needed for declaration of ff_mpeg4_decode_picture_header. Modified: trunk/libavcodec/mpeg4video_parser.c Modified: trunk/libavcodec/mpeg4video_parser.c ============================================================================== --- trunk/libavcodec/mpeg4video_parser.c Sun Feb 28 03:32:16 2010 (r22099) +++ trunk/libavcodec/mpeg4video_parser.c Sun Feb 28 03:41:20 2010 (r22100) @@ -22,6 +22,7 @@ #include "parser.h" #include "mpegvideo.h" +#include "mpeg4video.h" #include "mpeg4video_parser.h"

1 0

r22099 - trunk/libavutil/sha.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 03:32:16 2010 New Revision: 22099 Log: Include sha1.h from sha.c: It contains several prototypes. Modified: trunk/libavutil/sha.c Modified: trunk/libavutil/sha.c ============================================================================== --- trunk/libavutil/sha.c Sun Feb 28 03:04:34 2010 (r22098) +++ trunk/libavutil/sha.c Sun Feb 28 03:32:16 2010 (r22099) @@ -25,6 +25,7 @@ #include "avutil.h" #include "bswap.h" #include "sha.h" +#include "sha1.h" #include "intreadwrite.h" /** hash context */

1 0

r30787 - trunk/libswscale/utils.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 03:18:16 2010 New Revision: 30787 Log: Make sws_dcVec static: It is only used inside libswscale/utils.c. Modified: trunk/libswscale/utils.c Modified: trunk/libswscale/utils.c ============================================================================== --- trunk/libswscale/utils.c Sun Feb 28 02:06:09 2010 (r30786) +++ trunk/libswscale/utils.c Sun Feb 28 03:18:16 2010 (r30787) @@ -1311,7 +1311,7 @@ SwsVector *sws_getIdentityVec(void) return sws_getConstVec(1.0, 1); } -double sws_dcVec(SwsVector *a) +static double sws_dcVec(SwsVector *a) { int i; double sum=0;

1 0

r22098 - trunk/libavformat/avc.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 03:04:34 2010 New Revision: 22098 Log: Include avc.h from avc.c: It contains several prototypes. Modified: trunk/libavformat/avc.c Modified: trunk/libavformat/avc.c ============================================================================== --- trunk/libavformat/avc.c Sun Feb 28 02:51:13 2010 (r22097) +++ trunk/libavformat/avc.c Sun Feb 28 03:04:34 2010 (r22098) @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio.h" +#include "avc.h" static const uint8_t *ff_avc_find_startcode_internal(const uint8_t *p, const uint8_t *end) {

1 0

r22097 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 02:51:13 2010 New Revision: 22097 Log: Make mp4_read_descr static: It is only used inside libavformat/mov.c. Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c Sun Feb 28 02:43:47 2010 (r22096) +++ trunk/libavformat/mov.c Sun Feb 28 02:51:13 2010 (r22097) @@ -396,7 +396,7 @@ int ff_mp4_read_descr_len(ByteIOContext return len; } -int mp4_read_descr(AVFormatContext *fc, ByteIOContext *pb, int *tag) +static int mp4_read_descr(AVFormatContext *fc, ByteIOContext *pb, int *tag) { int len; *tag = get_byte(pb);

1 0

r22096 - trunk/libavformat/apetag.c
by subversion＠mplayerhq.hu 28 Feb '10

28 Feb '10

Author: cehoyos Date: Sun Feb 28 02:43:47 2010 New Revision: 22096 Log: Include apetag.h which contains the prototype for ff_ape_parse_tag(). Modified: trunk/libavformat/apetag.c Modified: trunk/libavformat/apetag.c ============================================================================== --- trunk/libavformat/apetag.c Sat Feb 27 22:13:22 2010 (r22095) +++ trunk/libavformat/apetag.c Sun Feb 28 02:43:47 2010 (r22096) @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "apetag.h" #define ENABLE_DEBUG 0

1 0

r22095 - in trunk/libavcodec: avcodec.h utils.c
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: reimar Date: Sat Feb 27 22:13:22 2010 New Revision: 22095 Log: Fix avcodec_align_dimensions to return values suitably aligned for FLV decoding with SSE and add a avcodec_align_dimensions2 taht returns the stride alignment requirements independently from doing the width/height padding. Modified: trunk/libavcodec/avcodec.h trunk/libavcodec/utils.c Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Sat Feb 27 16:25:28 2010 (r22094) +++ trunk/libavcodec/avcodec.h Sat Feb 27 22:13:22 2010 (r22095) @@ -1367,7 +1367,7 @@ typedef struct AVCodecContext { /** * Called at the beginning of each frame to get a buffer for it. * If pic.reference is set then the frame will be read later by libavcodec. - * avcodec_align_dimensions() should be used to find the required width and + * avcodec_align_dimensions2() should be used to find the required width and * height, as they normally need to be rounded up to the next multiple of 16. * if CODEC_CAP_DR1 is not set then get_buffer() must call * avcodec_default_get_buffer() instead of providing buffers allocated by @@ -3226,7 +3226,19 @@ AVFrame *avcodec_alloc_frame(void); int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic); void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic); int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic); +/** + * Modifies width and height values so that they will result in a memory + * buffer that is acceptable for the codec if you do not use any horizontal + * padding. + */ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height); +/** + * Modifies width and height values so that they will result in a memory + * buffer that is acceptable for the codec if you also ensure that all + * line sizes are a multiple of the respective linesize_align[i]. + */ +void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, + int linesize_align[4]); /** * Checks if the given dimension of a picture is valid, meaning that all Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Sat Feb 27 16:25:28 2010 (r22094) +++ trunk/libavcodec/utils.c Sat Feb 27 22:13:22 2010 (r22095) @@ -31,6 +31,7 @@ #include "libavutil/avstring.h" #include "libavutil/integer.h" #include "libavutil/crc.h" +#include "libavutil/pixdesc.h" #include "avcodec.h" #include "dsputil.h" #include "opt.h" @@ -117,7 +118,7 @@ typedef struct InternalBuffer{ #define INTERNAL_BUFFER_SIZE 32 -void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ +void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[4]){ int w_align= 1; int h_align= 1; @@ -180,6 +181,36 @@ void avcodec_align_dimensions(AVCodecCon *height= FFALIGN(*height, h_align); if(s->codec_id == CODEC_ID_H264) *height+=2; // some of the optimized chroma MC reads one line too much + + linesize_align[0] = + linesize_align[1] = + linesize_align[2] = + linesize_align[3] = STRIDE_ALIGN; +//STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes +//we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the +//picture size unneccessarily in some cases. The solution here is not +//pretty and better ideas are welcome! +#if HAVE_MMX + if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 || + s->codec_id == CODEC_ID_VP6 || s->codec_id == CODEC_ID_VP6F || + s->codec_id == CODEC_ID_VP6A) { + linesize_align[0] = + linesize_align[1] = + linesize_align[2] = 16; + } +#endif +} + +void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ + int chroma_shift = av_pix_fmt_descriptors[s->pix_fmt].log2_chroma_w; + int linesize_align[4]; + int align; + avcodec_align_dimensions2(s, width, height, linesize_align); + align = FFMAX(linesize_align[0], linesize_align[3]); + linesize_align[1] <<= chroma_shift; + linesize_align[2] <<= chroma_shift; + align = FFMAX3(align, linesize_align[1], linesize_align[2]); + *width=FFALIGN(*width, align); } int avcodec_check_dimensions(void *av_log_ctx, unsigned int w, unsigned int h){ @@ -244,7 +275,7 @@ int avcodec_default_get_buffer(AVCodecCo avcodec_get_chroma_sub_sample(s->pix_fmt, &h_chroma_shift, &v_chroma_shift); - avcodec_align_dimensions(s, &w, &h); + avcodec_align_dimensions2(s, &w, &h, stride_align); if(!(s->flags&CODEC_FLAG_EMU_EDGE)){ w+= EDGE_WIDTH*2; @@ -260,18 +291,6 @@ int avcodec_default_get_buffer(AVCodecCo unaligned = 0; for (i=0; i<4; i++){ -//STRIDE_ALIGN is 8 for SSE* but this does not work for SVQ1 chroma planes -//we could change STRIDE_ALIGN to 16 for x86/sse but it would increase the -//picture size unneccessarily in some cases. The solution here is not -//pretty and better ideas are welcome! -#if HAVE_MMX - if(s->codec_id == CODEC_ID_SVQ1 || s->codec_id == CODEC_ID_VP5 || - s->codec_id == CODEC_ID_VP6 || s->codec_id == CODEC_ID_VP6F || - s->codec_id == CODEC_ID_VP6A) - stride_align[i]= 16; - else -#endif - stride_align[i] = STRIDE_ALIGN; unaligned |= picture.linesize[i] % stride_align[i]; } } while (unaligned);

1 0

r22064 - trunk/common.mak
by subversion＠mplayerhq.hu 27 Feb '10

27 Feb '10

Author: mru Date: Fri Feb 26 00:27:54 2010 New Revision: 22064 Log: Disable suffix rules Most of the make builtin rules, which we do not need, are suffix rules, and we use only new-style pattern rules. Disabling suffix rules saves some time when building on slow systems. Modified: trunk/common.mak Modified: trunk/common.mak ============================================================================== --- trunk/common.mak Thu Feb 25 20:55:01 2010 (r22063) +++ trunk/common.mak Fri Feb 26 00:27:54 2010 (r22064) @@ -51,6 +51,10 @@ install: install-libs install-headers uninstall: uninstall-libs uninstall-headers .PHONY: all depend dep *clean install* uninstall* examples testprogs + +# Disable suffix rules. Most of the builtin rules are suffix rules, +# so this saves some time on slow systems. +.SUFFIXES: endif OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes)

4 4