From 5d603f1b655ee717c6639fc2fcb2c13e4a925b6f Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Sun, 20 May 2012 16:20:56 +0200 Subject: http: Factorize the code by adding http_read_header() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This function is used for reading http reply headers. Signed-off-by: Martin Storsjö --- libavformat/http.c | 78 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index c69e3f5055..ea7c693b34 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -324,13 +324,35 @@ static inline int has_header(const char *str, const char *header) return av_stristart(str, header + 2, NULL) || av_stristr(str, header); } +static int http_read_header(URLContext *h, int *new_location) +{ + HTTPContext *s = h->priv_data; + char line[1024]; + int err = 0; + + for (;;) { + if (http_get_line(s, line, sizeof(line)) < 0) + return AVERROR(EIO); + + av_dlog(NULL, "header='%s'\n", line); + + err = process_line(h, line, s->line_count, new_location); + if (err < 0) + return err; + if (err == 0) + break; + s->line_count++; + } + + return err; +} + static int http_connect(URLContext *h, const char *path, const char *local_path, const char *hoststr, const char *auth, const char *proxyauth, int *new_location) { HTTPContext *s = h->priv_data; int post, err; - char line[1024]; char headers[1024] = ""; char *authstr = NULL, *proxyauthstr = NULL; int64_t off = s->off; @@ -403,19 +425,9 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, s->chunksize = -1; /* wait for header */ - for(;;) { - if (http_get_line(s, line, sizeof(line)) < 0) - return AVERROR(EIO); - - av_dlog(NULL, "header='%s'\n", line); - - err = process_line(h, line, s->line_count, new_location); - if (err < 0) - return err; - if (err == 0) - break; - s->line_count++; - } + err = http_read_header(h, new_location); + if (err < 0) + return err; return (off == s->off) ? 0 : -1; } @@ -603,10 +615,11 @@ static int http_proxy_open(URLContext *h, const char *uri, int flags) HTTPContext *s = h->priv_data; char hostname[1024], hoststr[1024]; char auth[1024], pathbuf[1024], *path; - char line[1024], lower_url[100]; + char lower_url[100]; int port, ret = 0, attempts = 0; HTTPAuthType cur_auth_type; char *authstr; + int new_loc; h->is_streamed = 1; @@ -647,30 +660,19 @@ redo: s->filesize = -1; cur_auth_type = s->proxy_auth_state.auth_type; - for (;;) { - int new_loc; - // Note: This uses buffering, potentially reading more than the - // HTTP header. If tunneling a protocol where the server starts - // the conversation, we might buffer part of that here, too. - // Reading that requires using the proper ffurl_read() function - // on this URLContext, not using the fd directly (as the tls - // protocol does). This shouldn't be an issue for tls though, - // since the client starts the conversation there, so there - // is no extra data that we might buffer up here. - if (http_get_line(s, line, sizeof(line)) < 0) { - ret = AVERROR(EIO); - goto fail; - } - - av_dlog(h, "header='%s'\n", line); + /* Note: This uses buffering, potentially reading more than the + * HTTP header. If tunneling a protocol where the server starts + * the conversation, we might buffer part of that here, too. + * Reading that requires using the proper ffurl_read() function + * on this URLContext, not using the fd directly (as the tls + * protocol does). This shouldn't be an issue for tls though, + * since the client starts the conversation there, so there + * is no extra data that we might buffer up here. + */ + ret = http_read_header(h, &new_loc); + if (ret < 0) + goto fail; - ret = process_line(h, line, s->line_count, &new_loc); - if (ret < 0) - goto fail; - if (ret == 0) - break; - s->line_count++; - } attempts++; if (s->http_code == 407 && (cur_auth_type == HTTP_AUTH_NONE || s->proxy_auth_state.stale) && -- cgit v1.2.3 From e9cef89702e2bde918102e784c6b75a7979e85d1 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 26 May 2011 20:19:04 +0200 Subject: avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. Signed-off-by: Justin Ruggles --- doc/APIchanges | 4 ++++ libavformat/avformat.h | 6 +++++- libavformat/flvenc.c | 3 ++- libavformat/framecrcenc.c | 2 +- libavformat/matroskaenc.c | 8 +++++--- libavformat/md5enc.c | 2 +- libavformat/smjpegenc.c | 2 +- libavformat/swfenc.c | 2 ++ libavformat/utils.c | 4 +++- libavformat/version.h | 2 +- libavformat/wav.c | 1 + 11 files changed, 26 insertions(+), 10 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index dac87ee606..18105c55ba 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-05-xx - xxxxxxx - lavf 54.3.0 + Add AVFMT_TS_NONSTRICT format flag to indicate that a muxer supports + non-increasing monotone timestamps. + 2012-05-15 - lavfi 2.17.0 Add support for audio filters ac71230/a2cd9be - add video/audio buffer sink in a new installed diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 33e9098ff3..040e35eb92 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -351,6 +351,9 @@ typedef struct AVProbeData { #define AVFMT_NOGENSEARCH 0x4000 /**< Format does not allow to fallback to generic search */ #define AVFMT_NO_BYTE_SEEK 0x8000 /**< Format does not allow seeking by bytes */ #define AVFMT_ALLOW_FLUSH 0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */ +#define AVFMT_TS_NONSTRICT 0x20000 /**< Format does not require strictly + increasing timestamps, but they must + still be monotonic */ /** * @addtogroup lavf_encoding @@ -373,7 +376,8 @@ typedef struct AVOutputFormat { /** * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, - * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH + * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, + * AVFMT_TS_NONSTRICT */ int flags; diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 19169adbc5..3a51aaabb0 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -488,5 +488,6 @@ AVOutputFormat ff_flv_muxer = { .codec_tag = (const AVCodecTag* const []){ flv_video_codec_ids, flv_audio_codec_ids, 0 }, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT, }; diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index d1148f9190..36dfd297c6 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -43,5 +43,5 @@ AVOutputFormat ff_framecrc_muxer = { .video_codec = CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framecrc_write_packet, - .flags = AVFMT_VARIABLE_FPS, + .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, }; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9334b52d6d..61a91d7117 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1305,7 +1305,8 @@ AVOutputFormat ff_matroska_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, ff_codec_wav_tags, 0 }, @@ -1326,7 +1327,8 @@ AVOutputFormat ff_webm_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT, }; #endif @@ -1346,7 +1348,7 @@ AVOutputFormat ff_matroska_audio_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER, + .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, }; #endif diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index 3fd54506b3..4e8db3cbe0 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -106,6 +106,6 @@ AVOutputFormat ff_framemd5_muxer = { .video_codec = CODEC_ID_RAWVIDEO, .write_header = ff_framehash_write_header, .write_packet = framemd5_write_packet, - .flags = AVFMT_VARIABLE_FPS, + .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT, }; #endif diff --git a/libavformat/smjpegenc.c b/libavformat/smjpegenc.c index 45ba20b643..e27b895845 100644 --- a/libavformat/smjpegenc.c +++ b/libavformat/smjpegenc.c @@ -144,6 +144,6 @@ AVOutputFormat ff_smjpeg_muxer = { .write_header = smjpeg_write_header, .write_packet = smjpeg_write_packet, .write_trailer = smjpeg_write_trailer, - .flags = AVFMT_GLOBALHEADER, + .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 }, }; diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 82ec7ff9bc..fb0fdc5426 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -513,6 +513,7 @@ AVOutputFormat ff_swf_muxer = { .write_header = swf_write_header, .write_packet = swf_write_packet, .write_trailer = swf_write_trailer, + .flags = AVFMT_TS_NONSTRICT, }; #endif #if CONFIG_AVM2_MUXER @@ -526,5 +527,6 @@ AVOutputFormat ff_avm2_muxer = { .write_header = swf_write_header, .write_packet = swf_write_packet, .write_trailer = swf_write_trailer, + .flags = AVFMT_TS_NONSTRICT, }; #endif diff --git a/libavformat/utils.c b/libavformat/utils.c index e8430b23fa..438752174e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2962,7 +2962,9 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt){ pkt->dts= st->pts_buffer[0]; } - if(st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && st->cur_dts >= pkt->dts){ + if (st->cur_dts && st->cur_dts != AV_NOPTS_VALUE && + ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && + st->cur_dts >= pkt->dts) || st->cur_dts > pkt->dts)) { av_log(s, AV_LOG_ERROR, "Application provided invalid, non monotonically increasing dts to muxer in stream %d: %"PRId64" >= %"PRId64"\n", st->index, st->cur_dts, pkt->dts); diff --git a/libavformat/version.h b/libavformat/version.h index 91ddfd27e8..7bd0b8e5f5 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 2 +#define LIBAVFORMAT_VERSION_MINOR 3 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavformat/wav.c b/libavformat/wav.c index 85849c1e75..c01121f9db 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -216,6 +216,7 @@ AVOutputFormat ff_wav_muxer = { .write_header = wav_write_header, .write_packet = wav_write_packet, .write_trailer = wav_write_trailer, + .flags = AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, .priv_class = &wav_muxer_class, }; -- cgit v1.2.3 From 9309bdfe2ce59aa047b9a25e70a948c7ca9e8b76 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 20 May 2012 16:10:42 +0200 Subject: fate: change name of FATE samples location environment variable FATE_SAMPLES is now used directly by the Makefiles, which induces the test system to run a test with the value of the environment variable as name. Renaming the environment variable to LIBAV_SAMPLES avoids this problem. --- configure | 4 ++-- doc/fate.texi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index f6cb0e2558..b81394d3c2 100755 --- a/configure +++ b/configure @@ -258,7 +258,7 @@ Developer options (useful when working on Libav itself): --disable-optimizations disable compiler optimizations --enable-extra-warnings enable more compiler warnings --samples=PATH location of test samples for FATE, if not set use - \$FATE_SAMPLES at make invocation time. + \$LIBAV_SAMPLES at make invocation time. --enable-xmm-clobber-test check XMM registers for clobbering (Win64-only; should be used only for debugging purposes) @@ -3374,7 +3374,7 @@ SLIB_INSTALL_NAME=${SLIB_INSTALL_NAME} SLIB_INSTALL_LINKS=${SLIB_INSTALL_LINKS} SLIB_INSTALL_EXTRA_LIB=${SLIB_INSTALL_EXTRA_LIB} SLIB_INSTALL_EXTRA_SHLIB=${SLIB_INSTALL_EXTRA_SHLIB} -SAMPLES:=${samples:-\$(FATE_SAMPLES)} +SAMPLES:=${samples:-\$(LIBAV_SAMPLES)} EOF get_version(){ diff --git a/doc/fate.texi b/doc/fate.texi index 5489d95133..b69301ac84 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -26,7 +26,7 @@ that is provided separately from the actual source distribution. To inform the build system about the testsuite location, pass @option{--samples=} to @command{configure} or set the -@var{SAMPLES} Make variable or the @var{FATE_SAMPLES} environment variable +@var{SAMPLES} Make variable or the @var{LIBAV_SAMPLES} environment variable to a suitable value. The dataset is available through @command{rsync}, is possible to fetch -- cgit v1.2.3 From db9e00f469d2dd3f43edfdea8eb78a816c87c79b Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 20 May 2012 23:46:40 +0200 Subject: Remove libnut wrapper libnut is unmaintained and known to be buggy; native NUT code exists. --- configure | 7 -- libavformat/Makefile | 2 - libavformat/allformats.c | 1 - libavformat/libnut.c | 311 ----------------------------------------------- 4 files changed, 321 deletions(-) delete mode 100644 libavformat/libnut.c diff --git a/configure b/configure index b81394d3c2..07baa2f0c0 100755 --- a/configure +++ b/configure @@ -176,8 +176,6 @@ External library support: --enable-libfreetype enable libfreetype [no] --enable-libgsm enable GSM support via libgsm [no] --enable-libmp3lame enable MP3 encoding via libmp3lame [no] - --enable-libnut enable NUT (de)muxing via libnut, - native (de)muxer exists [no] --enable-libopenjpeg enable JPEG 2000 decoding via OpenJPEG [no] --enable-libpulse enable Pulseaudio input via libpulse [no] --enable-librtmp enable RTMP[E] support via librtmp [no] @@ -948,7 +946,6 @@ CONFIG_LIST=" libfreetype libgsm libmp3lame - libnut libopencore_amrnb libopencore_amrwb libopencv @@ -1455,8 +1452,6 @@ dirac_demuxer_select="dirac_parser" eac3_demuxer_select="ac3_parser" flac_demuxer_select="flac_parser" ipod_muxer_select="mov_muxer" -libnut_demuxer_deps="libnut" -libnut_muxer_deps="libnut" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_suggest="zlib bzlib" mov_demuxer_suggest="zlib" @@ -2969,7 +2964,6 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaa enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame -enabled libnut && require libnut libnut.h nut_demuxer_init -lnut enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader @@ -3258,7 +3252,6 @@ echo "libdc1394 support ${libdc1394-no}" echo "libfaac enabled ${libfaac-no}" echo "libgsm enabled ${libgsm-no}" echo "libmp3lame enabled ${libmp3lame-no}" -echo "libnut enabled ${libnut-no}" echo "libopencore-amrnb support ${libopencore_amrnb-no}" echo "libopencore-amrwb support ${libopencore_amrwb-no}" echo "libopencv support ${libopencv-no}" diff --git a/libavformat/Makefile b/libavformat/Makefile index 00b65e498a..0e041d106a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -328,8 +328,6 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o # external libraries -OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o -OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o OBJS-$(CONFIG_LIBRTMP) += librtmp.o # protocols I/O diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1b7badea8f..1320a28ac6 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -263,7 +263,6 @@ void av_register_all(void) REGISTER_PROTOCOL (UDP, udp); /* external libraries */ - REGISTER_MUXDEMUX (LIBNUT, libnut); REGISTER_PROTOCOL (LIBRTMP, librtmp); REGISTER_PROTOCOL (LIBRTMPE, librtmpe); REGISTER_PROTOCOL (LIBRTMPS, librtmps); diff --git a/libavformat/libnut.c b/libavformat/libnut.c deleted file mode 100644 index 4295d67015..0000000000 --- a/libavformat/libnut.c +++ /dev/null @@ -1,311 +0,0 @@ -/* - * NUT (de)muxing via libnut - * copyright (c) 2006 Oded Shimon - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * NUT demuxing and muxing via libnut. - * @author Oded Shimon - */ - -#include "avformat.h" -#include "internal.h" -#include "riff.h" -#include - -#define ID_STRING "nut/multimedia container" -#define ID_LENGTH (strlen(ID_STRING) + 1) - -typedef struct { - nut_context_tt * nut; - nut_stream_header_tt * s; -} NUTContext; - -static const AVCodecTag nut_tags[] = { - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, - { CODEC_ID_MP3, MKTAG('m', 'p', '3', ' ') }, - { CODEC_ID_VORBIS, MKTAG('v', 'r', 'b', 's') }, - { 0, 0 }, -}; - -#if CONFIG_LIBNUT_MUXER -static int av_write(void * h, size_t len, const uint8_t * buf) { - AVIOContext * bc = h; - avio_write(bc, buf, len); - //avio_flush(bc); - return len; -} - -static int nut_write_header(AVFormatContext * avf) { - NUTContext * priv = avf->priv_data; - AVIOContext * bc = avf->pb; - nut_muxer_opts_tt mopts = { - .output = { - .priv = bc, - .write = av_write, - }, - .alloc = { av_malloc, av_realloc, av_free }, - .write_index = 1, - .realtime_stream = 0, - .max_distance = 32768, - .fti = NULL, - }; - nut_stream_header_tt * s; - int i; - - priv->s = s = av_mallocz((avf->nb_streams + 1) * sizeof*s); - - for (i = 0; i < avf->nb_streams; i++) { - AVCodecContext * codec = avf->streams[i]->codec; - int j; - int fourcc = 0; - int num, denom, ssize; - - s[i].type = codec->codec_type == AVMEDIA_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS; - - if (codec->codec_tag) fourcc = codec->codec_tag; - else fourcc = ff_codec_get_tag(nut_tags, codec->codec_id); - - if (!fourcc) { - if (codec->codec_type == AVMEDIA_TYPE_VIDEO) fourcc = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id); - if (codec->codec_type == AVMEDIA_TYPE_AUDIO) fourcc = ff_codec_get_tag(ff_codec_wav_tags, codec->codec_id); - } - - s[i].fourcc_len = 4; - s[i].fourcc = av_malloc(s[i].fourcc_len); - for (j = 0; j < s[i].fourcc_len; j++) s[i].fourcc[j] = (fourcc >> (j*8)) & 0xFF; - - ff_parse_specific_params(codec, &num, &ssize, &denom); - avpriv_set_pts_info(avf->streams[i], 60, denom, num); - - s[i].time_base.num = denom; - s[i].time_base.den = num; - - s[i].fixed_fps = 0; - s[i].decode_delay = codec->has_b_frames; - s[i].codec_specific_len = codec->extradata_size; - s[i].codec_specific = codec->extradata; - - if (codec->codec_type == AVMEDIA_TYPE_VIDEO) { - s[i].width = codec->width; - s[i].height = codec->height; - s[i].sample_width = 0; - s[i].sample_height = 0; - s[i].colorspace_type = 0; - } else { - s[i].samplerate_num = codec->sample_rate; - s[i].samplerate_denom = 1; - s[i].channel_count = codec->channels; - } - } - - s[avf->nb_streams].type = -1; - priv->nut = nut_muxer_init(&mopts, s, NULL); - - return 0; -} - -static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) { - NUTContext * priv = avf->priv_data; - nut_packet_tt p; - - p.len = pkt->size; - p.stream = pkt->stream_index; - p.pts = pkt->pts; - p.flags = pkt->flags & AV_PKT_FLAG_KEY ? NUT_FLAG_KEY : 0; - p.next_pts = 0; - - nut_write_frame_reorder(priv->nut, &p, pkt->data); - - return 0; -} - -static int nut_write_trailer(AVFormatContext * avf) { - AVIOContext * bc = avf->pb; - NUTContext * priv = avf->priv_data; - int i; - - nut_muxer_uninit_reorder(priv->nut); - avio_flush(bc); - - for(i = 0; priv->s[i].type != -1; i++ ) av_freep(&priv->s[i].fourcc); - av_freep(&priv->s); - - return 0; -} - -AVOutputFormat ff_libnut_muxer = { - .name = "libnut", - .long_name = "nut format", - .mime_type = "video/x-nut", - .extensions = "nut", - .priv_data_size = sizeof(NUTContext), - .audio_codec = CODEC_ID_VORBIS, - .video_codec = CODEC_ID_MPEG4, - .write_header = nut_write_header, - .write_packet = nut_write_packet, - .write_trailer = nut_write_trailer, - .flags = AVFMT_GLOBALHEADER, -}; -#endif /* CONFIG_LIBNUT_MUXER */ - -static int nut_probe(AVProbeData *p) { - if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX; - - return 0; -} - -static size_t av_read(void * h, size_t len, uint8_t * buf) { - AVIOContext * bc = h; - return avio_read(bc, buf, len); -} - -static off_t av_seek(void * h, long long pos, int whence) { - AVIOContext * bc = h; - if (whence == SEEK_END) { - pos = avio_size(bc) + pos; - whence = SEEK_SET; - } - return avio_seek(bc, pos, whence); -} - -static int nut_read_header(AVFormatContext * avf) { - NUTContext * priv = avf->priv_data; - AVIOContext * bc = avf->pb; - nut_demuxer_opts_tt dopts = { - .input = { - .priv = bc, - .seek = av_seek, - .read = av_read, - .eof = NULL, - .file_pos = 0, - }, - .alloc = { av_malloc, av_realloc, av_free }, - .read_index = 1, - .cache_syncpoints = 1, - }; - nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts); - nut_stream_header_tt * s; - int ret, i; - - if ((ret = nut_read_headers(nut, &s, NULL))) { - av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret)); - nut_demuxer_uninit(nut); - return -1; - } - - priv->s = s; - - for (i = 0; s[i].type != -1 && i < 2; i++) { - AVStream * st = avformat_new_stream(avf, NULL); - int j; - - for (j = 0; j < s[i].fourcc_len && j < 8; j++) st->codec->codec_tag |= s[i].fourcc[j]<<(j*8); - - st->codec->has_b_frames = s[i].decode_delay; - - st->codec->extradata_size = s[i].codec_specific_len; - if (st->codec->extradata_size) { - st->codec->extradata = av_mallocz(st->codec->extradata_size); - memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size); - } - - avpriv_set_pts_info(avf->streams[i], 60, s[i].time_base.num, s[i].time_base.den); - st->start_time = 0; - st->duration = s[i].max_pts; - - st->codec->codec_id = ff_codec_get_id(nut_tags, st->codec->codec_tag); - - switch(s[i].type) { - case NUT_AUDIO_CLASS: - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codec->codec_tag); - - st->codec->channels = s[i].channel_count; - st->codec->sample_rate = s[i].samplerate_num / s[i].samplerate_denom; - break; - case NUT_VIDEO_CLASS: - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codec->codec_tag); - - st->codec->width = s[i].width; - st->codec->height = s[i].height; - st->sample_aspect_ratio.num = s[i].sample_width; - st->sample_aspect_ratio.den = s[i].sample_height; - break; - } - if (st->codec->codec_id == CODEC_ID_NONE) av_log(avf, AV_LOG_ERROR, "Unknown codec?!\n"); - } - - return 0; -} - -static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) { - NUTContext * priv = avf->priv_data; - nut_packet_tt pd; - int ret; - - ret = nut_read_next_packet(priv->nut, &pd); - - if (ret || av_new_packet(pkt, pd.len) < 0) { - if (ret != NUT_ERR_EOF) - av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret)); - return -1; - } - - if (pd.flags & NUT_FLAG_KEY) pkt->flags |= AV_PKT_FLAG_KEY; - pkt->pts = pd.pts; - pkt->stream_index = pd.stream; - pkt->pos = avio_tell(avf->pb); - - ret = nut_read_frame(priv->nut, &pd.len, pkt->data); - - return ret; -} - -static int nut_read_seek(AVFormatContext * avf, int stream_index, int64_t target_ts, int flags) { - NUTContext * priv = avf->priv_data; - int active_streams[] = { stream_index, -1 }; - double time_pos = target_ts * priv->s[stream_index].time_base.num / (double)priv->s[stream_index].time_base.den; - - if (nut_seek(priv->nut, time_pos, 2*!(flags & AVSEEK_FLAG_BACKWARD), active_streams)) return -1; - - return 0; -} - -static int nut_read_close(AVFormatContext *s) { - NUTContext * priv = s->priv_data; - - nut_demuxer_uninit(priv->nut); - - return 0; -} - -AVInputFormat ff_libnut_demuxer = { - .name = "libnut", - .long_name = NULL_IF_CONFIG_SMALL("NUT format"), - .priv_data_size = sizeof(NUTContext), - .read_probe = nut_probe, - .read_header = nut_read_header, - .read_packet = nut_read_packet, - .read_close = nut_read_close, - .read_seek = nut_read_seek, - .extensions = "nut", -}; -- cgit v1.2.3 From 13a867a63e64c62a41b7aa31bc61ca91a5eb1cf6 Mon Sep 17 00:00:00 2001 From: Jordi Ortiz Date: Sat, 19 May 2012 13:06:50 +0200 Subject: dwt: K&R prettyprinting cosmetics Signed-off-by: Diego Biurrun --- libavcodec/dwt.c | 1192 ++++++++++++++++++++++++++++++------------------------ libavcodec/dwt.h | 74 ++-- 2 files changed, 713 insertions(+), 553 deletions(-) diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c index 2c5b56ca48..f9577fd1bd 100644 --- a/libavcodec/dwt.c +++ b/libavcodec/dwt.c @@ -22,27 +22,28 @@ #include "dsputil.h" #include "dwt.h" -void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer) +void ff_slice_buffer_init(slice_buffer *buf, int line_count, + int max_allocated_lines, int line_width, + IDWTELEM *base_buffer) { int i; buf->base_buffer = base_buffer; - buf->line_count = line_count; - buf->line_width = line_width; - buf->data_count = max_allocated_lines; - buf->line = av_mallocz (sizeof(IDWTELEM *) * line_count); - buf->data_stack = av_malloc (sizeof(IDWTELEM *) * max_allocated_lines); - - for(i = 0; i < max_allocated_lines; i++){ - buf->data_stack[i] = av_malloc (sizeof(IDWTELEM) * line_width); - } + buf->line_count = line_count; + buf->line_width = line_width; + buf->data_count = max_allocated_lines; + buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count); + buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines); + + for (i = 0; i < max_allocated_lines; i++) + buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width); buf->data_stack_top = max_allocated_lines - 1; } -IDWTELEM * ff_slice_buffer_load_line(slice_buffer * buf, int line) +IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line) { - IDWTELEM * buffer; + IDWTELEM *buffer; assert(buf->data_stack_top >= 0); // assert(!buf->line[line]); @@ -56,9 +57,9 @@ IDWTELEM * ff_slice_buffer_load_line(slice_buffer * buf, int line) return buffer; } -void ff_slice_buffer_release(slice_buffer * buf, int line) +void ff_slice_buffer_release(slice_buffer *buf, int line) { - IDWTELEM * buffer; + IDWTELEM *buffer; assert(line >= 0 && line < buf->line_count); assert(buf->line[line]); @@ -66,713 +67,844 @@ void ff_slice_buffer_release(slice_buffer * buf, int line) buffer = buf->line[line]; buf->data_stack_top++; buf->data_stack[buf->data_stack_top] = buffer; - buf->line[line] = NULL; + buf->line[line] = NULL; } -void ff_slice_buffer_flush(slice_buffer * buf) +void ff_slice_buffer_flush(slice_buffer *buf) { int i; - for(i = 0; i < buf->line_count; i++){ + for (i = 0; i < buf->line_count; i++) if (buf->line[i]) ff_slice_buffer_release(buf, i); - } } -void ff_slice_buffer_destroy(slice_buffer * buf) +void ff_slice_buffer_destroy(slice_buffer *buf) { int i; ff_slice_buffer_flush(buf); - for(i = buf->data_count - 1; i >= 0; i--){ + for (i = buf->data_count - 1; i >= 0; i--) av_freep(&buf->data_stack[i]); - } av_freep(&buf->data_stack); av_freep(&buf->line); } -static inline int mirror(int v, int m){ - while((unsigned)v > (unsigned)m){ - v=-v; - if(v<0) v+= 2*m; +static inline int mirror(int v, int m) +{ + while ((unsigned)v > (unsigned)m) { + v = -v; + if (v < 0) + v += 2 * m; } return v; } -static av_always_inline void -lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, - int dst_step, int src_step, int ref_step, - int width, int mul, int add, int shift, - int highpass, int inverse){ - const int mirror_left= !highpass; - const int mirror_right= (width&1) ^ highpass; - const int w= (width>>1) - 1 + (highpass & width); +static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, + int dst_step, int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); int i; -#define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref))) - if(mirror_left){ - dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse); - dst += dst_step; - src += src_step; +#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref))) + if (mirror_left) { + dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse); + dst += dst_step; + src += src_step; } - for(i=0; i>shift), - inverse); - } + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFT(src[i * src_step], + ((mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + + add) >> shift), + inverse); - if(mirror_right){ - dst[w*dst_step] = - LIFT(src[w*src_step], - ((mul*2*ref[w*ref_step]+add)>>shift), - inverse); - } + if (mirror_right) + dst[w * dst_step] = LIFT(src[w * src_step], + ((mul * 2 * ref[w * ref_step] + add) >> shift), + inverse); } -static av_always_inline void -inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref, - int dst_step, int src_step, int ref_step, - int width, int mul, int add, int shift, - int highpass, int inverse){ - const int mirror_left= !highpass; - const int mirror_right= (width&1) ^ highpass; - const int w= (width>>1) - 1 + (highpass & width); +static av_always_inline void inv_lift(IDWTELEM *dst, IDWTELEM *src, IDWTELEM *ref, + int dst_step, int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); int i; -#define LIFT(src, ref, inv) ((src) + ((inv) ? - (ref) : + (ref))) - if(mirror_left){ - dst[0] = LIFT(src[0], ((mul*2*ref[0]+add)>>shift), inverse); - dst += dst_step; - src += src_step; +#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref))) + if (mirror_left) { + dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse); + dst += dst_step; + src += src_step; } - for(i=0; i>shift), - inverse); - } + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFT(src[i * src_step], + ((mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + + add) >> shift), + inverse); - if(mirror_right){ - dst[w*dst_step] = - LIFT(src[w*src_step], - ((mul*2*ref[w*ref_step]+add)>>shift), - inverse); + if (mirror_right) { + dst[w * dst_step] = LIFT(src[w * src_step], + ((mul * 2 * ref[w * ref_step] + add) >> shift), + inverse); } } #ifndef liftS -static av_always_inline void -liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, - int dst_step, int src_step, int ref_step, - int width, int mul, int add, int shift, - int highpass, int inverse){ - const int mirror_left= !highpass; - const int mirror_right= (width&1) ^ highpass; - const int w= (width>>1) - 1 + (highpass & width); +static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, + int dst_step, int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); int i; assert(shift == 4); -#define LIFTS(src, ref, inv) \ - ((inv) ? \ - (src) + (((ref) + 4*(src))>>shift): \ - -((-16*(src) + (ref) + add/4 + 1 + (5<<25))/(5*4) - (1<<23))) - if(mirror_left){ - dst[0] = LIFTS(src[0], mul*2*ref[0]+add, inverse); - dst += dst_step; - src += src_step; - } - - for(i=0; i>1) - 1 + (highpass & width); +#define LIFTS(src, ref, inv) \ + ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \ + : -((-16 * (src) + (ref) + add / \ + 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) + if (mirror_left) { + dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); + dst += dst_step; + src += src_step; + } + + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFTS(src[i * src_step], + mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + add, + inverse); + + if (mirror_right) + dst[w * dst_step] = LIFTS(src[w * src_step], + mul * 2 * ref[w * ref_step] + add, + inverse); +} + +static av_always_inline void inv_liftS(IDWTELEM *dst, IDWTELEM *src, + IDWTELEM *ref, int dst_step, + int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); int i; assert(shift == 4); -#define LIFTS(src, ref, inv) \ - ((inv) ? \ - (src) + (((ref) + 4*(src))>>shift): \ - -((-16*(src) + (ref) + add/4 + 1 + (5<<25))/(5*4) - (1<<23))) - if(mirror_left){ - dst[0] = LIFTS(src[0], mul*2*ref[0]+add, inverse); - dst += dst_step; - src += src_step; - } - - for(i=0; i> shift) \ + : -((-16 * (src) + (ref) + add / \ + 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) + if (mirror_left) { + dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); + dst += dst_step; + src += src_step; + } + + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFTS(src[i * src_step], + mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + add, + inverse); + + if (mirror_right) + dst[w * dst_step] = LIFTS(src[w * src_step], + mul * 2 * ref[w * ref_step] + add, inverse); } #endif /* ! liftS */ -static void horizontal_decompose53i(DWTELEM *b, int width){ +static void horizontal_decompose53i(DWTELEM *b, int width) +{ DWTELEM temp[width]; - const int width2= width>>1; + const int width2 = width >> 1; int x; - const int w2= (width+1)>>1; + const int w2 = (width + 1) >> 1; - for(x=0; x>1; - A4 += (A1 + 1)>>1; - b[0+width2] = A1; - b[0 ] = A4; - for(x=1; x+1>1; - A2 += (A1 + A3 + 2)>>2; - b[x+width2] = A3; - b[x ] = A2; - - A1= temp[x+1+width2]; - A2= temp[x+2 ]; - A1 -= (A2 + A4)>>1; - A4 += (A1 + A3 + 2)>>2; - b[x+1+width2] = A1; - b[x+1 ] = A4; - } - A3= temp[width-1]; - A3 -= A2; - A2 += (A1 + A3 + 2)>>2; - b[width -1] = A3; - b[width2-1] = A2; + int A1, A2, A3, A4; + A2 = temp[1]; + A4 = temp[0]; + A1 = temp[0 + width2]; + A1 -= (A2 + A4) >> 1; + A4 += (A1 + 1) >> 1; + b[0 + width2] = A1; + b[0] = A4; + for (x = 1; x + 1 < width2; x += 2) { + A3 = temp[x + width2]; + A4 = temp[x + 1]; + A3 -= (A2 + A4) >> 1; + A2 += (A1 + A3 + 2) >> 2; + b[x + width2] = A3; + b[x] = A2; + + A1 = temp[x + 1 + width2]; + A2 = temp[x + 2]; + A1 -= (A2 + A4) >> 1; + A4 += (A1 + A3 + 2) >> 2; + b[x + 1 + width2] = A1; + b[x + 1] = A4; + } + A3 = temp[width - 1]; + A3 -= A2; + A2 += (A1 + A3 + 2) >> 2; + b[width - 1] = A3; + b[width2 - 1] = A2; } #else - lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0); - lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0); + lift(b + w2, temp + w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0); + lift(b, temp, b + w2, 1, 1, 1, width, 1, 2, 2, 0, 0); #endif /* 0 */ } -static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>1; - } + for (i = 0; i < width; i++) + b1[i] -= (b0[i] + b2[i]) >> 1; } -static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>2; - } + for (i = 0; i < width; i++) + b1[i] += (b0[i] + b2[i] + 2) >> 2; } -static void spatial_decompose53i(DWTELEM *buffer, int width, int height, int stride){ +static void spatial_decompose53i(DWTELEM *buffer, int width, int height, + int stride) +{ int y; - DWTELEM *b0= buffer + mirror(-2-1, height-1)*stride; - DWTELEM *b1= buffer + mirror(-2 , height-1)*stride; + DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride; + DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride; - for(y=-2; y>1; + const int w2 = (width + 1) >> 1; - lift (temp+w2, b +1, b , 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1); - liftS(temp , b , temp+w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0); - lift (b +w2, temp+w2, temp , 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0); - lift (b , temp , b +w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0); + lift(temp + w2, b + 1, b, 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1); + liftS(temp, b, temp + w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0); + lift(b + w2, temp + w2, temp, 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0); + lift(b, temp, b + w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0); } - -static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_AS; - } + for (i = 0; i < width; i++) + b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; } -static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_CS; - } + for (i = 0; i < width; i++) + b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; } -static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_BS; + b1[i] -= (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS; #else - b1[i] = (16*4*b1[i] - 4*(b0[i] + b2[i]) + W_BO*5 + (5<<27)) / (5*16) - (1<<23); + b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) / + (5 * 16) - (1 << 23); #endif - } } -static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, int width){ +static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_DS; - } + for (i = 0; i < width; i++) + b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; } -static void spatial_decompose97i(DWTELEM *buffer, int width, int height, int stride){ +static void spatial_decompose97i(DWTELEM *buffer, int width, int height, + int stride) +{ int y; - DWTELEM *b0= buffer + mirror(-4-1, height-1)*stride; - DWTELEM *b1= buffer + mirror(-4 , height-1)*stride; - DWTELEM *b2= buffer + mirror(-4+1, height-1)*stride; - DWTELEM *b3= buffer + mirror(-4+2, height-1)*stride; - - for(y=-4; y>level, height>>level, stride<>level, height>>level, stride<> level, height >> level, + stride << level); + break; + case DWT_53: + spatial_decompose53i(buffer, + width >> level, height >> level, + stride << level); + break; } } } -static void horizontal_compose53i(IDWTELEM *b, int width){ +static void horizontal_compose53i(IDWTELEM *b, int width) +{ IDWTELEM temp[width]; - const int width2= width>>1; - const int w2= (width+1)>>1; + const int width2 = width >> 1; + const int w2 = (width + 1) >> 1; int x; - for(x=0; x>1); - for(x=2; x>2); - b[x-1] = temp[x-1] + ((b [x-2] + b [x ]+1)>>1); + b[0] = temp[0] - ((temp[1] + 1) >> 1); + for (x = 2; x < width - 1; x += 2) { + b[x] = temp[x] - ((temp[x - 1] + temp[x + 1] + 2) >> 2); + b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); } - if(width&1){ - b[x ] = temp[x ] - ((temp[x-1]+1)>>1); - b[x-1] = temp[x-1] + ((b [x-2] + b [x ]+1)>>1); - }else - b[x-1] = temp[x-1] + b[x-2]; + if (width & 1) { + b[x] = temp[x] - ((temp[x - 1] + 1) >> 1); + b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); + } else + b[x - 1] = temp[x - 1] + b[x - 2]; } -static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>1; - } + for (i = 0; i < width; i++) + b1[i] += (b0[i] + b2[i]) >> 1; } -static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>2; - } + for (i = 0; i < width; i++) + b1[i] -= (b0[i] + b2[i] + 2) >> 2; } -static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){ - cs->b0 = slice_buffer_get_line(sb, mirror(-1-1, height-1) * stride_line); - cs->b1 = slice_buffer_get_line(sb, mirror(-1 , height-1) * stride_line); - cs->y = -1; +static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer *sb, + int height, int stride_line) +{ + cs->b0 = slice_buffer_get_line(sb, + mirror(-1 - 1, height - 1) * stride_line); + cs->b1 = slice_buffer_get_line(sb, mirror(-1, height - 1) * stride_line); + cs->y = -1; } -static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){ - cs->b0 = buffer + mirror(-1-1, height-1)*stride; - cs->b1 = buffer + mirror(-1 , height-1)*stride; - cs->y = -1; +static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, + int height, int stride) +{ + cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride; + cs->b1 = buffer + mirror(-1, height - 1) * stride; + cs->y = -1; } -static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){ - int y= cs->y; +static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer *sb, + int width, int height, + int stride_line) +{ + int y = cs->y; - IDWTELEM *b0= cs->b0; - IDWTELEM *b1= cs->b1; - IDWTELEM *b2= slice_buffer_get_line(sb, mirror(y+1, height-1) * stride_line); - IDWTELEM *b3= slice_buffer_get_line(sb, mirror(y+2, height-1) * stride_line); + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = slice_buffer_get_line(sb, + mirror(y + 1, height - 1) * + stride_line); + IDWTELEM *b3 = slice_buffer_get_line(sb, + mirror(y + 2, height - 1) * + stride_line); - if(y+1<(unsigned)height && y<(unsigned)height){ + if (y + 1 < (unsigned)height && y < (unsigned)height) { int x; - for(x=0; x>2; - b1[x] += (b0[x] + b2[x])>>1; + for (x = 0; x < width; x++) { + b2[x] -= (b1[x] + b3[x] + 2) >> 2; + b1[x] += (b0[x] + b2[x]) >> 1; } - }else{ - if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width); - if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width); + } else { + if (y + 1 < (unsigned)height) + vertical_compose53iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose53iH0(b0, b1, b2, width); } - if(y-1<(unsigned)height) horizontal_compose53i(b0, width); - if(y+0<(unsigned)height) horizontal_compose53i(b1, width); + if (y - 1 < (unsigned)height) + horizontal_compose53i(b0, width); + if (y + 0 < (unsigned)height) + horizontal_compose53i(b1, width); - cs->b0 = b2; - cs->b1 = b3; - cs->y += 2; + cs->b0 = b2; + cs->b1 = b3; + cs->y += 2; } -static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){ - int y= cs->y; - IDWTELEM *b0= cs->b0; - IDWTELEM *b1= cs->b1; - IDWTELEM *b2= buffer + mirror(y+1, height-1)*stride; - IDWTELEM *b3= buffer + mirror(y+2, height-1)*stride; +static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, + int height, int stride) +{ + int y = cs->y; + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; + IDWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; - if(y+1<(unsigned)height) vertical_compose53iL0(b1, b2, b3, width); - if(y+0<(unsigned)height) vertical_compose53iH0(b0, b1, b2, width); + if (y + 1 < (unsigned)height) + vertical_compose53iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose53iH0(b0, b1, b2, width); - if(y-1<(unsigned)height) horizontal_compose53i(b0, width); - if(y+0<(unsigned)height) horizontal_compose53i(b1, width); + if (y - 1 < (unsigned)height) + horizontal_compose53i(b0, width); + if (y + 0 < (unsigned)height) + horizontal_compose53i(b1, width); - cs->b0 = b2; - cs->b1 = b3; - cs->y += 2; + cs->b0 = b2; + cs->b1 = b3; + cs->y += 2; } -static void av_unused spatial_compose53i(IDWTELEM *buffer, int width, int height, int stride){ +static void av_unused spatial_compose53i(IDWTELEM *buffer, int width, + int height, int stride) +{ DWTCompose cs; spatial_compose53i_init(&cs, buffer, height, stride); - while(cs.y <= height) + while (cs.y <= height) spatial_compose53i_dy(&cs, buffer, width, height, stride); } - -void ff_snow_horizontal_compose97i(IDWTELEM *b, int width){ +void ff_snow_horizontal_compose97i(IDWTELEM *b, int width) +{ IDWTELEM temp[width]; - const int w2= (width+1)>>1; + const int w2 = (width + 1) >> 1; #if 0 //maybe more understadable but slower - inv_lift (temp , b , b +w2, 2, 1, 1, width, W_DM, W_DO, W_DS, 0, 1); - inv_lift (temp+1 , b +w2, temp , 2, 1, 2, width, W_CM, W_CO, W_CS, 1, 1); + inv_lift(temp, b, b + w2, 2, 1, 1, width, W_DM, W_DO, W_DS, 0, 1); + inv_lift(temp + 1, b + w2, temp, 2, 1, 2, width, W_CM, W_CO, W_CS, 1, 1); - inv_liftS(b , temp , temp+1 , 2, 2, 2, width, W_BM, W_BO, W_BS, 0, 1); - inv_lift (b+1 , temp+1 , b , 2, 2, 2, width, W_AM, W_AO, W_AS, 1, 0); + inv_liftS(b, temp, temp + 1, 2, 2, 2, width, W_BM, W_BO, W_BS, 0, 1); + inv_lift(b + 1, temp + 1, b, 2, 2, 2, width, W_AM, W_AO, W_AS, 1, 0); #else int x; - temp[0] = b[0] - ((3*b[w2]+2)>>2); - for(x=1; x<(width>>1); x++){ - temp[2*x ] = b[x ] - ((3*(b [x+w2-1] + b[x+w2])+4)>>3); - temp[2*x-1] = b[x+w2-1] - temp[2*x-2] - temp[2*x]; - } - if(width&1){ - temp[2*x ] = b[x ] - ((3*b [x+w2-1]+2)>>2); - temp[2*x-1] = b[x+w2-1] - temp[2*x-2] - temp[2*x]; - }else - temp[2*x-1] = b[x+w2-1] - 2*temp[2*x-2]; - - b[0] = temp[0] + ((2*temp[0] + temp[1]+4)>>3); - for(x=2; x>4); - b[x-1] = temp[x-1] + ((3*(b [x-2] + b [x ] ))>>1); - } - if(width&1){ - b[x ] = temp[x ] + ((2*temp[x ] + temp[x-1]+4)>>3); - b[x-1] = temp[x-1] + ((3*(b [x-2] + b [x ] ))>>1); - }else - b[x-1] = temp[x-1] + 3*b [x-2]; + temp[0] = b[0] - ((3 * b[w2] + 2) >> 2); + for (x = 1; x < (width >> 1); x++) { + temp[2 * x] = b[x] - ((3 * (b[x + w2 - 1] + b[x + w2]) + 4) >> 3); + temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; + } + if (width & 1) { + temp[2 * x] = b[x] - ((3 * b[x + w2 - 1] + 2) >> 2); + temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; + } else + temp[2 * x - 1] = b[x + w2 - 1] - 2 * temp[2 * x - 2]; + + b[0] = temp[0] + ((2 * temp[0] + temp[1] + 4) >> 3); + for (x = 2; x < width - 1; x += 2) { + b[x] = temp[x] + ((4 * temp[x] + temp[x - 1] + temp[x + 1] + 8) >> 4); + b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); + } + if (width & 1) { + b[x] = temp[x] + ((2 * temp[x] + temp[x - 1] + 4) >> 3); + b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); + } else + b[x - 1] = temp[x - 1] + 3 * b[x - 2]; #endif } -static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_AS; - } + for (i = 0; i < width; i++) + b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; } -static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_CS; - } + for (i = 0; i < width; i++) + b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; } -static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_BS; + b1[i] += (W_BM * (b0[i] + b2[i]) + W_BO) >> W_BS; #else - b1[i] += (W_BM*(b0[i] + b2[i])+4*b1[i]+W_BO)>>W_BS; + b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS; #endif - } } -static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width){ +static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ int i; - for(i=0; i>W_DS; - } + for (i = 0; i < width; i++) + b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; } -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width){ +void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width) +{ int i; - for(i=0; i>W_DS; - b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS; + for (i = 0; i < width; i++) { + b4[i] -= (W_DM * (b3[i] + b5[i]) + W_DO) >> W_DS; + b3[i] -= (W_CM * (b2[i] + b4[i]) + W_CO) >> W_CS; #ifdef liftS - b2[i] += (W_BM*(b1[i] + b3[i])+W_BO)>>W_BS; + b2[i] += (W_BM * (b1[i] + b3[i]) + W_BO) >> W_BS; #else - b2[i] += (W_BM*(b1[i] + b3[i])+4*b2[i]+W_BO)>>W_BS; + b2[i] += (W_BM * (b1[i] + b3[i]) + 4 * b2[i] + W_BO) >> W_BS; #endif - b1[i] += (W_AM*(b0[i] + b2[i])+W_AO)>>W_AS; + b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; } } -static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer * sb, int height, int stride_line){ - cs->b0 = slice_buffer_get_line(sb, mirror(-3-1, height-1) * stride_line); - cs->b1 = slice_buffer_get_line(sb, mirror(-3 , height-1) * stride_line); - cs->b2 = slice_buffer_get_line(sb, mirror(-3+1, height-1) * stride_line); - cs->b3 = slice_buffer_get_line(sb, mirror(-3+2, height-1) * stride_line); - cs->y = -3; +static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer *sb, + int height, int stride_line) +{ + cs->b0 = slice_buffer_get_line(sb, mirror(-3 - 1, height - 1) * stride_line); + cs->b1 = slice_buffer_get_line(sb, mirror(-3, height - 1) * stride_line); + cs->b2 = slice_buffer_get_line(sb, mirror(-3 + 1, height - 1) * stride_line); + cs->b3 = slice_buffer_get_line(sb, mirror(-3 + 2, height - 1) * stride_line); + cs->y = -3; } -static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride){ - cs->b0 = buffer + mirror(-3-1, height-1)*stride; - cs->b1 = buffer + mirror(-3 , height-1)*stride; - cs->b2 = buffer + mirror(-3+1, height-1)*stride; - cs->b3 = buffer + mirror(-3+2, height-1)*stride; - cs->y = -3; +static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, + int stride) +{ + cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride; + cs->b1 = buffer + mirror(-3, height - 1) * stride; + cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride; + cs->b3 = buffer + mirror(-3 + 2, height - 1) * stride; + cs->y = -3; } -static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line){ +static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs, + slice_buffer *sb, int width, + int height, int stride_line) +{ int y = cs->y; - IDWTELEM *b0= cs->b0; - IDWTELEM *b1= cs->b1; - IDWTELEM *b2= cs->b2; - IDWTELEM *b3= cs->b3; - IDWTELEM *b4= slice_buffer_get_line(sb, mirror(y + 3, height - 1) * stride_line); - IDWTELEM *b5= slice_buffer_get_line(sb, mirror(y + 4, height - 1) * stride_line); - - if(y>0 && y+4b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = cs->b2; + IDWTELEM *b3 = cs->b3; + IDWTELEM *b4 = slice_buffer_get_line(sb, + mirror(y + 3, height - 1) * + stride_line); + IDWTELEM *b5 = slice_buffer_get_line(sb, + mirror(y + 4, height - 1) * + stride_line); + + if (y > 0 && y + 4 < height) { dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width); - }else{ - if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width); - if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width); - if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width); - if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width); - } - - if(y-1<(unsigned)height) dsp->horizontal_compose97i(b0, width); - if(y+0<(unsigned)height) dsp->horizontal_compose97i(b1, width); - - cs->b0=b2; - cs->b1=b3; - cs->b2=b4; - cs->b3=b5; - cs->y += 2; -} - -static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride){ - int y = cs->y; - IDWTELEM *b0= cs->b0; - IDWTELEM *b1= cs->b1; - IDWTELEM *b2= cs->b2; - IDWTELEM *b3= cs->b3; - IDWTELEM *b4= buffer + mirror(y+3, height-1)*stride; - IDWTELEM *b5= buffer + mirror(y+4, height-1)*stride; - - if(y+3<(unsigned)height) vertical_compose97iL1(b3, b4, b5, width); - if(y+2<(unsigned)height) vertical_compose97iH1(b2, b3, b4, width); - if(y+1<(unsigned)height) vertical_compose97iL0(b1, b2, b3, width); - if(y+0<(unsigned)height) vertical_compose97iH0(b0, b1, b2, width); - - if(y-1<(unsigned)height) ff_snow_horizontal_compose97i(b0, width); - if(y+0<(unsigned)height) ff_snow_horizontal_compose97i(b1, width); - - cs->b0=b2; - cs->b1=b3; - cs->b2=b4; - cs->b3=b5; - cs->y += 2; -} - -static void av_unused spatial_compose97i(IDWTELEM *buffer, int width, int height, int stride){ + } else { + if (y + 3 < (unsigned)height) + vertical_compose97iL1(b3, b4, b5, width); + if (y + 2 < (unsigned)height) + vertical_compose97iH1(b2, b3, b4, width); + if (y + 1 < (unsigned)height) + vertical_compose97iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose97iH0(b0, b1, b2, width); + } + + if (y - 1 < (unsigned)height) + dsp->horizontal_compose97i(b0, width); + if (y + 0 < (unsigned)height) + dsp->horizontal_compose97i(b1, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->b2 = b4; + cs->b3 = b5; + cs->y += 2; +} + +static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, int width, + int height, int stride) +{ + int y = cs->y; + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = cs->b2; + IDWTELEM *b3 = cs->b3; + IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; + IDWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; + + if (y + 3 < (unsigned)height) + vertical_compose97iL1(b3, b4, b5, width); + if (y + 2 < (unsigned)height) + vertical_compose97iH1(b2, b3, b4, width); + if (y + 1 < (unsigned)height) + vertical_compose97iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose97iH0(b0, b1, b2, width); + + if (y - 1 < (unsigned)height) + ff_snow_horizontal_compose97i(b0, width); + if (y + 0 < (unsigned)height) + ff_snow_horizontal_compose97i(b1, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->b2 = b4; + cs->b3 = b5; + cs->y += 2; +} + +static void av_unused spatial_compose97i(IDWTELEM *buffer, int width, + int height, int stride) +{ DWTCompose cs; spatial_compose97i_init(&cs, buffer, height, stride); - while(cs.y <= height) + while (cs.y <= height) spatial_compose97i_dy(&cs, buffer, width, height, stride); } -void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count){ +void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, + int height, int stride_line, int type, + int decomposition_count) +{ int level; - for(level=decomposition_count-1; level>=0; level--){ - switch(type){ - case DWT_97: spatial_compose97i_buffered_init(cs+level, sb, height>>level, stride_line<>level, stride_line<= 0; level--) { + switch (type) { + case DWT_97: + spatial_compose97i_buffered_init(cs + level, sb, height >> level, + stride_line << level); + break; + case DWT_53: + spatial_compose53i_buffered_init(cs + level, sb, height >> level, + stride_line << level); + break; } } } -void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y){ - const int support = type==1 ? 3 : 5; +void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, + slice_buffer *slice_buf, int width, + int height, int stride_line, int type, + int decomposition_count, int y) +{ + const int support = type == 1 ? 3 : 5; int level; - if(type==2) return; - - for(level=decomposition_count-1; level>=0; level--){ - while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ - switch(type){ - case DWT_97: spatial_compose97i_dy_buffered(dsp, cs+level, slice_buf, width>>level, height>>level, stride_line<= 0; level--) + while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { + switch (type) { + case DWT_97: + spatial_compose97i_dy_buffered(dsp, cs + level, slice_buf, + width >> level, + height >> level, + stride_line << level); break; - case DWT_53: spatial_compose53i_dy_buffered(cs+level, slice_buf, width>>level, height>>level, stride_line<> level, + height >> level, + stride_line << level); break; } } - } } -static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ +static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, + int height, int stride, int type, + int decomposition_count) +{ int level; - for(level=decomposition_count-1; level>=0; level--){ - switch(type){ - case DWT_97: spatial_compose97i_init(cs+level, buffer, height>>level, stride<>level, stride<= 0; level--) { + switch (type) { + case DWT_97: + spatial_compose97i_init(cs + level, buffer, height >> level, + stride << level); + break; + case DWT_53: + spatial_compose53i_init(cs + level, buffer, height >> level, + stride << level); + break; } } } -static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count, int y){ - const int support = type==1 ? 3 : 5; +static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, int width, + int height, int stride, int type, + int decomposition_count, int y) +{ + const int support = type == 1 ? 3 : 5; int level; - if(type==2) return; - - for(level=decomposition_count-1; level>=0; level--){ - while(cs[level].y <= FFMIN((y>>level)+support, height>>level)){ - switch(type){ - case DWT_97: spatial_compose97i_dy(cs+level, buffer, width>>level, height>>level, stride<= 0; level--) + while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { + switch (type) { + case DWT_97: + spatial_compose97i_dy(cs + level, buffer, width >> level, + height >> level, stride << level); break; - case DWT_53: spatial_compose53i_dy(cs+level, buffer, width>>level, height>>level, stride<> level, + height >> level, stride << level); break; } } - } } -void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count){ - DWTCompose cs[MAX_DECOMPOSITIONS]; - int y; - ff_spatial_idwt_init(cs, buffer, width, height, stride, type, decomposition_count); - for(y=0; y>(dec_count-level); - int sx= (ori&1) ? size : 0; - int stride= 32<<(dec_count-level); - int sy= (ori&2) ? stride>>1 : 0; - - for(i=0; i> (dec_count - level); + int sx = (ori & 1) ? size : 0; + int stride = 32 << (dec_count - level); + int sy = (ori & 2) ? stride >> 1 : 0; + + for (i = 0; i < size; i++) + for (j = 0; j < size; j++) { + int v = tmp[sx + sy + i * stride + j] * + scale[type][dec_count - 3][level][ori]; s += FFABS(v); } - } } - } - assert(s>=0); - return s>>9; + assert(s >= 0); + return s >> 9; } -static int w53_8_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ - return w_c(v, pix1, pix2, line_size, 8, h, 1); +static int w53_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 8, h, 1); } -static int w97_8_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ - return w_c(v, pix1, pix2, line_size, 8, h, 0); +static int w97_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 8, h, 0); } -static int w53_16_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ +static int w53_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ return w_c(v, pix1, pix2, line_size, 16, h, 1); } -static int w97_16_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ +static int w97_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ return w_c(v, pix1, pix2, line_size, 16, h, 0); } -int ff_w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ +int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ return w_c(v, pix1, pix2, line_size, 32, h, 1); } -int ff_w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h){ +int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ return w_c(v, pix1, pix2, line_size, 32, h, 0); } void ff_dsputil_init_dwt(DSPContext *c) { - c->w53[0]= w53_16_c; - c->w53[1]= w53_8_c; - c->w97[0]= w97_16_c; - c->w97[1]= w97_8_c; + c->w53[0] = w53_16_c; + c->w53[1] = w53_8_c; + c->w97[0] = w97_16_c; + c->w97[1] = w97_8_c; } void ff_dwt_init(DWTContext *c) { - c->vertical_compose97i = ff_snow_vertical_compose97i; + c->vertical_compose97i = ff_snow_vertical_compose97i; c->horizontal_compose97i = ff_snow_horizontal_compose97i; - c->inner_add_yblock = ff_snow_inner_add_yblock; + c->inner_add_yblock = ff_snow_inner_add_yblock; - if (HAVE_MMX) ff_dwt_init_x86(c); + if (HAVE_MMX) + ff_dwt_init_x86(c); } diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h index fc73fe7e8e..6c28447cab 100644 --- a/libavcodec/dwt.h +++ b/libavcodec/dwt.h @@ -34,21 +34,27 @@ typedef struct { int y; } DWTCompose; -/** Used to minimize the amount of memory used in order to optimize cache performance. **/ +/** Used to minimize the amount of memory used in order to + * optimize cache performance. **/ typedef struct slice_buffer_s { - IDWTELEM * * line; ///< For use by idwt and predict_slices. - IDWTELEM * * data_stack; ///< Used for internal purposes. + IDWTELEM **line; ///< For use by idwt and predict_slices. + IDWTELEM **data_stack; ///< Used for internal purposes. int data_stack_top; int line_count; int line_width; int data_count; - IDWTELEM * base_buffer; ///< Buffer that this structure is caching. + IDWTELEM *base_buffer; ///< Buffer that this structure is caching. } slice_buffer; typedef struct DWTContext { - void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); + void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width); void (*horizontal_compose97i)(IDWTELEM *b, int width); - void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); + void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride, + uint8_t **block, int b_w, int b_h, int src_x, + int src_y, int src_stride, slice_buffer *sb, + int add, uint8_t *dst8); } DWTContext; #define MAX_DECOMPOSITIONS 8 @@ -126,27 +132,43 @@ typedef struct DWTContext { #define W_DS 9 #endif -#define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : ff_slice_buffer_load_line((slice_buf), (line_num))) -//#define slice_buffer_get_line(slice_buf, line_num) (ff_slice_buffer_load_line((slice_buf), (line_num))) - -void ff_slice_buffer_init(slice_buffer * buf, int line_count, int max_allocated_lines, int line_width, IDWTELEM * base_buffer); -void ff_slice_buffer_release(slice_buffer * buf, int line); -void ff_slice_buffer_flush(slice_buffer * buf); -void ff_slice_buffer_destroy(slice_buffer * buf); -IDWTELEM * ff_slice_buffer_load_line(slice_buffer * buf, int line); - -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, int width); +#define slice_buffer_get_line(slice_buf, line_num) \ + ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] \ + : ff_slice_buffer_load_line((slice_buf), \ + (line_num))) + +void ff_slice_buffer_init(slice_buffer *buf, int line_count, + int max_allocated_lines, int line_width, + IDWTELEM *base_buffer); +void ff_slice_buffer_release(slice_buffer *buf, int line); +void ff_slice_buffer_flush(slice_buffer *buf); +void ff_slice_buffer_destroy(slice_buffer *buf); +IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); + +void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width); void ff_snow_horizontal_compose97i(IDWTELEM *b, int width); -void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t * * block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer * sb, int add, uint8_t * dst8); - -int ff_w53_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); -int ff_w97_32_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h); - -void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, int decomposition_count); - -void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer * sb, int width, int height, int stride_line, int type, int decomposition_count); -void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, slice_buffer * slice_buf, int width, int height, int stride_line, int type, int decomposition_count, int y); -void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, int type, int decomposition_count); +void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, + uint8_t **block, int b_w, int b_h, int src_x, + int src_y, int src_stride, slice_buffer *sb, + int add, uint8_t *dst8); + +int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); +int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); + +void ff_spatial_dwt(int *buffer, int width, int height, int stride, int type, + int decomposition_count); + +void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, + int height, int stride_line, int type, + int decomposition_count); +void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, + slice_buffer *slice_buf, int width, + int height, int stride_line, int type, + int decomposition_count, int y); +void ff_spatial_idwt(IDWTELEM *buffer, int width, int height, int stride, + int type, int decomposition_count); void ff_dwt_init(DWTContext *c); void ff_dwt_init_x86(DWTContext *c); -- cgit v1.2.3