May 2015 - ffmpeg-cvslog - lists.ffmpeg.org

mpegvideo: Move MotionEstContext and function declarations to a separate header
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri May 29 19:44:05 2015 +0100| [149fa0b7ac180fe1df48a2e379c560813555bf57] | committer: Vittorio Giovara mpegvideo: Move MotionEstContext and function declarations to a separate header > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=149fa0b7ac180fe1d… --- libavcodec/motion_est.c | 1 + libavcodec/motion_est.h | 128 +++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/mpegvideo.h | 88 +------------------------------- 3 files changed, 130 insertions(+), 87 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index c51be8d..d0c0439 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -34,6 +34,7 @@ #include "avcodec.h" #include "internal.h" #include "mathops.h" +#include "motion_est.h" #include "mpegutils.h" #include "mpegvideo.h" diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h new file mode 100644 index 0000000..cbfbbe8 --- /dev/null +++ b/libavcodec/motion_est.h @@ -0,0 +1,128 @@ +/* + * Motion estimation + * + * 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 + */ + +#ifndef AVCODEC_MOTIONEST_H +#define AVCODEC_MOTIONEST_H + +#include <stdint.h> + +#include "avcodec.h" +#include "hpeldsp.h" +#include "qpeldsp.h" + +struct MpegEncContext; + +#define MAX_MV 2048 + +/** + * Motion estimation context. + */ +typedef struct MotionEstContext { + AVCodecContext *avctx; + int skip; ///< set if ME is skipped for the current MB + int co_located_mv[4][2]; ///< mv from last P-frame for direct mode ME + int direct_basis_mv[4][2]; + uint8_t *scratchpad; /**< data area for the ME algo, so that + * the ME does not need to malloc/free. */ + uint8_t *best_mb; + uint8_t *temp_mb[2]; + uint8_t *temp; + int best_bits; + uint32_t *map; ///< map to avoid duplicate evaluations + uint32_t *score_map; ///< map to store the scores + unsigned map_generation; + int pre_penalty_factor; + int penalty_factor; /**< an estimate of the bits required to + * code a given mv value, e.g. (1,0) takes + * more bits than (0,0). We have to + * estimate whether any reduction in + * residual is worth the extra bits. */ + int sub_penalty_factor; + int mb_penalty_factor; + int flags; + int sub_flags; + int mb_flags; + int pre_pass; ///< = 1 for the pre pass + int dia_size; + int xmin; + int xmax; + int ymin; + int ymax; + int pred_x; + int pred_y; + uint8_t *src[4][4]; + uint8_t *ref[4][4]; + int stride; + int uvstride; + /* temp variables for picture complexity calculation */ + int mc_mb_var_sum_temp; + int mb_var_sum_temp; + int scene_change_score; + + op_pixels_func(*hpel_put)[4]; + op_pixels_func(*hpel_avg)[4]; + qpel_mc_func(*qpel_put)[16]; + qpel_mc_func(*qpel_avg)[16]; + uint8_t (*mv_penalty)[MAX_MV * 2 + 1]; ///< bit amount needed to encode a MV + uint8_t *current_mv_penalty; + int (*sub_motion_search)(struct MpegEncContext *s, + int *mx_ptr, int *my_ptr, int dmin, + int src_index, int ref_index, + int size, int h); +} MotionEstContext; + +static inline int ff_h263_round_chroma(int x) +{ + //FIXME static or not? + static const uint8_t h263_chroma_roundtab[16] = { + // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, + }; + return h263_chroma_roundtab[x & 0xf] + (x >> 3); +} + +int ff_init_me(struct MpegEncContext *s); + +void ff_estimate_p_frame_motion(struct MpegEncContext *s, int mb_x, int mb_y); +void ff_estimate_b_frame_motion(struct MpegEncContext *s, int mb_x, int mb_y); + +int ff_pre_estimate_p_frame_motion(struct MpegEncContext *s, + int mb_x, int mb_y); + +int ff_epzs_motion_search(struct MpegEncContext *s, int *mx_ptr, int *my_ptr, + int P[10][2], int src_index, int ref_index, + int16_t (*last_mv)[2], int ref_mv_scale, int size, + int h); + +int ff_get_mb_score(struct MpegEncContext *s, int mx, int my, int src_index, + int ref_index, int size, int h, int add_rate); + +int ff_get_best_fcode(struct MpegEncContext *s, + int16_t (*mv_table)[2], int type); + +void ff_fix_long_p_mvs(struct MpegEncContext *s); +void ff_fix_long_mvs(struct MpegEncContext *s, uint8_t *field_select_table, + int field_select, int16_t (*mv_table)[2], int f_code, + int type, int truncate); + +extern const uint8_t ff_aic_dc_scale_table[32]; +extern const uint8_t ff_h263_chroma_qscale_table[32]; + +#endif /* AVCODEC_MOTIONEST_H */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index bb27d06..7ede745 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -39,6 +39,7 @@ #include "hpeldsp.h" #include "idctdsp.h" #include "me_cmp.h" +#include "motion_est.h" #include "mpegvideodsp.h" #include "mpegvideoencdsp.h" #include "pixblockdsp.h" @@ -62,7 +63,6 @@ enum OutputFormat { }; #define MAX_FCODE 7 -#define MAX_MV 2048 #define MAX_THREADS 16 @@ -88,8 +88,6 @@ enum OutputFormat { #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -struct MpegEncContext; - /** * Picture. */ @@ -140,62 +138,6 @@ typedef struct Picture{ } Picture; /** - * Motion estimation context. - */ -typedef struct MotionEstContext{ - AVCodecContext *avctx; - int skip; ///< set if ME is skipped for the current MB - int co_located_mv[4][2]; ///< mv from last P-frame for direct mode ME - int direct_basis_mv[4][2]; - uint8_t *scratchpad; ///< data area for the ME algo, so that the ME does not need to malloc/free - uint8_t *best_mb; - uint8_t *temp_mb[2]; - uint8_t *temp; - int best_bits; - uint32_t *map; ///< map to avoid duplicate evaluations - uint32_t *score_map; ///< map to store the scores - unsigned map_generation; - int pre_penalty_factor; - int penalty_factor; /**< an estimate of the bits required to - code a given mv value, e.g. (1,0) takes - more bits than (0,0). We have to - estimate whether any reduction in - residual is worth the extra bits. */ - int sub_penalty_factor; - int mb_penalty_factor; - int flags; - int sub_flags; - int mb_flags; - int pre_pass; ///< = 1 for the pre pass - int dia_size; - int xmin; - int xmax; - int ymin; - int ymax; - int pred_x; - int pred_y; - uint8_t *src[4][4]; - uint8_t *ref[4][4]; - int stride; - int uvstride; - /* temp variables for picture complexity calculation */ - int mc_mb_var_sum_temp; - int mb_var_sum_temp; - int scene_change_score; -/* cmp, chroma_cmp;*/ - op_pixels_func (*hpel_put)[4]; - op_pixels_func (*hpel_avg)[4]; - qpel_mc_func (*qpel_put)[16]; - qpel_mc_func (*qpel_avg)[16]; - uint8_t (*mv_penalty)[MAX_MV*2+1]; ///< amount of bits needed to encode a MV - uint8_t *current_mv_penalty; - int (*sub_motion_search)(struct MpegEncContext * s, - int *mx_ptr, int *my_ptr, int dmin, - int src_index, int ref_index, - int size, int h); -}MotionEstContext; - -/** * MpegEncContext. */ typedef struct MpegEncContext { @@ -792,34 +734,6 @@ static inline int get_bits_diff(MpegEncContext *s){ return bits - last; } -static inline int ff_h263_round_chroma(int x){ - static const uint8_t h263_chroma_roundtab[16] = { - // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, - }; - return h263_chroma_roundtab[x & 0xf] + (x >> 3); -} - -/* motion_est.c */ -void ff_estimate_p_frame_motion(MpegEncContext * s, - int mb_x, int mb_y); -void ff_estimate_b_frame_motion(MpegEncContext * s, - int mb_x, int mb_y); -int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type); -void ff_fix_long_p_mvs(MpegEncContext * s); -void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select, - int16_t (*mv_table)[2], int f_code, int type, int truncate); -int ff_init_me(MpegEncContext *s); -int ff_pre_estimate_p_frame_motion(MpegEncContext * s, int mb_x, int mb_y); -int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, - int P[10][2], int src_index, int ref_index, int16_t (*last_mv)[2], - int ref_mv_scale, int size, int h); -int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, - int ref_index, int size, int h, int add_rate); - -extern const uint8_t ff_aic_dc_scale_table[32]; -extern const uint8_t ff_h263_chroma_qscale_table[32]; - /* rv10.c */ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); int ff_rv_decode_dc(MpegEncContext *s, int n);

1 0

mpegvideo: mpeg12: Move function declarations
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri May 29 19:44:04 2015 +0100| [b2b766914a49c4e3537df3a585e97b98d432edd2] | committer: Vittorio Giovara mpegvideo: mpeg12: Move function declarations > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2b766914a49c4e35… --- libavcodec/mpeg12.h | 6 ++++++ libavcodec/mpegvideo.h | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 9132dc3..4c1578f 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -71,4 +71,10 @@ int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n); void ff_mpeg1_clean_buffers(MpegEncContext *s); int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); +void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], + int motion_x, int motion_y); +void ff_mpeg1_encode_init(MpegEncContext *s); +void ff_mpeg1_encode_slice_header(MpegEncContext *s); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 7fd4f11..bb27d06 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -817,13 +817,6 @@ int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, int ref_index, int size, int h, int add_rate); -void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); -void ff_mpeg1_encode_mb(MpegEncContext *s, - int16_t block[8][64], - int motion_x, int motion_y); -void ff_mpeg1_encode_init(MpegEncContext *s); -void ff_mpeg1_encode_slice_header(MpegEncContext *s); - extern const uint8_t ff_aic_dc_scale_table[32]; extern const uint8_t ff_h263_chroma_qscale_table[32];

1 0

Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:26:56 2015 +0200| [0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4] | committer: Michael Niedermayer Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2' * commit 'b2b766914a49c4e3537df3a585e97b98d432edd2': mpegvideo: mpeg12: Move function declarations Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0aba7192e12bb5e49… ---

1 0

Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:17:40 2015 +0200| [fd116b8dfa731122e1b6f8ededf00074940e2848] | committer: Michael Niedermayer Merge commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61' * commit '378a00087fdadcc9b34165c05cd10a1a15f3fe61': mpegvideo: Move tables to a separate file Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd116b8dfa731122e… ---

1 0

Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:17:03 2015 +0200| [eb5a308d0e75120425c926b25b7141e2e8ea49bd] | committer: Michael Niedermayer Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332' * commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332': mpegvideo: msmpeg4: Move function declarations Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb5a308d0e7512042… ---

1 0

mpegvideo: Move tables to a separate file
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri May 29 19:44:03 2015 +0100| [378a00087fdadcc9b34165c05cd10a1a15f3fe61] | committer: Vittorio Giovara mpegvideo: Move tables to a separate file > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=378a00087fdadcc9b… --- libavcodec/Makefile | 3 +- libavcodec/flvdec.c | 1 + libavcodec/flvenc.c | 1 + libavcodec/h261enc.c | 1 + libavcodec/intelh263dec.c | 1 + libavcodec/ituh263dec.c | 1 + libavcodec/ituh263enc.c | 1 + libavcodec/mpeg12.c | 1 + libavcodec/mpeg12dec.c | 1 + libavcodec/mpeg4videodec.c | 1 + libavcodec/mpegvideo.c | 84 +----------------------------------- libavcodec/mpegvideo.h | 8 ---- libavcodec/mpegvideo_enc.c | 1 + libavcodec/mpegvideodata.c | 102 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/mpegvideodata.h | 33 ++++++++++++++ libavcodec/msmpeg4.c | 1 + libavcodec/rv10.c | 1 + libavcodec/rv20enc.c | 1 + 18 files changed, 151 insertions(+), 92 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0107460..96cc258 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -76,7 +76,8 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_fixed.o \ mpegaudiodsp_float.o OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideodsp.o rl.o \ - mpegvideo_motion.o mpegutils.o + mpegvideo_motion.o mpegutils.o \ + mpegvideodata.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 0a6f268..7161794 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -23,6 +23,7 @@ #include "flv.h" #include "h263.h" #include "mpegvideo.h" +#include "mpegvideodata.h" void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last) { diff --git a/libavcodec/flvenc.c b/libavcodec/flvenc.c index e14a105..f52f66a 100644 --- a/libavcodec/flvenc.c +++ b/libavcodec/flvenc.c @@ -21,6 +21,7 @@ #include "flv.h" #include "h263.h" #include "mpegvideo.h" +#include "mpegvideodata.h" void ff_flv_encode_picture_header(MpegEncContext *s, int picture_number) { diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index f24e590..ae61fc2 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -31,6 +31,7 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" +#include "mpegvideodata.h" int ff_h261_get_picture_format(int width, int height) { diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index e34da5c..3f37489 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -20,6 +20,7 @@ #include "mpegvideo.h" #include "h263.h" +#include "mpegvideodata.h" /* don't understand why they choose a different header ! */ int ff_intel_h263_decode_picture_header(MpegEncContext *s) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 1f9ac27..8f69f0f 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -41,6 +41,7 @@ #include "unary.h" #include "flv.h" #include "mpeg4video.h" +#include "mpegvideodata.h" // The defines below define the number of bits that are read at once for // reading vlc values. Changing these may improve speed and data cache needs diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 3afc238..952e15c 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -32,6 +32,7 @@ #include "libavutil/attributes.h" #include "avcodec.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "h263.h" #include "mathops.h" #include "mpegutils.h" diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 900761d..69c6d0a 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -32,6 +32,7 @@ #include "error_resilience.h" #include "mpeg12.h" #include "mpeg12data.h" +#include "mpegvideodata.h" #include "bytestream.h" #include "thread.h" diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index c66d6aa..d4c517d 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -41,6 +41,7 @@ #include "mpeg12data.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "thread.h" #include "version.h" #include "xvmc_internal.h" diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 7e36170..eb71a86 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -25,6 +25,7 @@ #include "internal.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mpeg4video.h" #include "h263.h" #include "thread.h" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 49f2e66..f380aee 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -39,6 +39,7 @@ #include "mathops.h" #include "mpegutils.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "mjpegenc.h" #include "msmpeg4.h" #include "qpeldsp.h" @@ -47,89 +48,6 @@ #include "wmv2.h" #include <limits.h> -static const uint8_t ff_default_chroma_qscale_table[32] = { -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 -}; - -const uint8_t ff_mpeg1_dc_scale_table[128] = { -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, -}; - -static const uint8_t mpeg2_dc_scale_table1[128] = { -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, -}; - -static const uint8_t mpeg2_dc_scale_table2[128] = { -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -}; - -static const uint8_t mpeg2_dc_scale_table3[128] = { -// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -}; - -const uint8_t *const ff_mpeg2_dc_scale_table[4] = { - ff_mpeg1_dc_scale_table, - mpeg2_dc_scale_table1, - mpeg2_dc_scale_table2, - mpeg2_dc_scale_table3, -}; - -const uint8_t ff_alternate_horizontal_scan[64] = { - 0, 1, 2, 3, 8, 9, 16, 17, - 10, 11, 4, 5, 6, 7, 15, 14, - 13, 12, 19, 18, 24, 25, 32, 33, - 26, 27, 20, 21, 22, 23, 28, 29, - 30, 31, 34, 35, 40, 41, 48, 49, - 42, 43, 36, 37, 38, 39, 44, 45, - 46, 47, 50, 51, 56, 57, 58, 59, - 52, 53, 54, 55, 60, 61, 62, 63, -}; - -const uint8_t ff_alternate_vertical_scan[64] = { - 0, 8, 16, 24, 1, 9, 2, 10, - 17, 25, 32, 40, 48, 56, 57, 49, - 41, 33, 26, 18, 3, 11, 4, 12, - 19, 27, 34, 42, 50, 58, 35, 43, - 51, 59, 20, 28, 5, 13, 6, 14, - 21, 29, 36, 44, 52, 60, 37, 45, - 53, 61, 22, 30, 7, 15, 23, 31, - 38, 46, 54, 62, 39, 47, 55, 63, -}; - static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s, int16_t *block, int n, int qscale) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 48c9cff..7fd4f11 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -88,10 +88,6 @@ enum OutputFormat { #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -/* encoding scans */ -extern const uint8_t ff_alternate_horizontal_scan[64]; -extern const uint8_t ff_alternate_vertical_scan[64]; - struct MpegEncContext; /** @@ -821,10 +817,6 @@ int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr, int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, int ref_index, int size, int h, int add_rate); -/* mpeg12.c */ -extern const uint8_t ff_mpeg1_dc_scale_table[128]; -extern const uint8_t * const ff_mpeg2_dc_scale_table[4]; - void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a477818..cb8a406 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -40,6 +40,7 @@ #include "idctdsp.h" #include "mpeg12.h" #include "mpegvideo.h" +#include "mpegvideodata.h" #include "h261.h" #include "h263.h" #include "mjpegenc_common.h" diff --git a/libavcodec/mpegvideodata.c b/libavcodec/mpegvideodata.c new file mode 100644 index 0000000..f27dd90 --- /dev/null +++ b/libavcodec/mpegvideodata.c @@ -0,0 +1,102 @@ +/* + * 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 + */ + +#include <stdint.h> + +const uint8_t ff_default_chroma_qscale_table[32] = { +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 +}; + +const uint8_t ff_mpeg1_dc_scale_table[128] = { +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, +}; + +static const uint8_t mpeg2_dc_scale_table1[128] = { +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, +}; + +static const uint8_t mpeg2_dc_scale_table2[128] = { +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +}; + +static const uint8_t mpeg2_dc_scale_table3[128] = { +// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +}; + +const uint8_t *const ff_mpeg2_dc_scale_table[4] = { + ff_mpeg1_dc_scale_table, + mpeg2_dc_scale_table1, + mpeg2_dc_scale_table2, + mpeg2_dc_scale_table3, +}; + +const uint8_t ff_alternate_horizontal_scan[64] = { + 0, 1, 2, 3, 8, 9, 16, 17, + 10, 11, 4, 5, 6, 7, 15, 14, + 13, 12, 19, 18, 24, 25, 32, 33, + 26, 27, 20, 21, 22, 23, 28, 29, + 30, 31, 34, 35, 40, 41, 48, 49, + 42, 43, 36, 37, 38, 39, 44, 45, + 46, 47, 50, 51, 56, 57, 58, 59, + 52, 53, 54, 55, 60, 61, 62, 63, +}; + +const uint8_t ff_alternate_vertical_scan[64] = { + 0, 8, 16, 24, 1, 9, 2, 10, + 17, 25, 32, 40, 48, 56, 57, 49, + 41, 33, 26, 18, 3, 11, 4, 12, + 19, 27, 34, 42, 50, 58, 35, 43, + 51, 59, 20, 28, 5, 13, 6, 14, + 21, 29, 36, 44, 52, 60, 37, 45, + 53, 61, 22, 30, 7, 15, 23, 31, + 38, 46, 54, 62, 39, 47, 55, 63, +}; diff --git a/libavcodec/mpegvideodata.h b/libavcodec/mpegvideodata.h new file mode 100644 index 0000000..d3ace23 --- /dev/null +++ b/libavcodec/mpegvideodata.h @@ -0,0 +1,33 @@ +/* + * 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 + */ + +#ifndef AVCODEC_MPEGVIDEODATA_H +#define AVCODEC_MPEGVIDEODATA_H + +#include <stdint.h> + +/* encoding scans */ +extern const uint8_t ff_alternate_horizontal_scan[64]; +extern const uint8_t ff_alternate_vertical_scan[64]; + +extern const uint8_t ff_mpeg1_dc_scale_table[128]; +extern const uint8_t * const ff_mpeg2_dc_scale_table[4]; + +extern const uint8_t ff_default_chroma_qscale_table[32]; + +#endif /* AVCODEC_MPEGVIDEODATA_H */ diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 95b5c93..94bd86e 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -35,6 +35,7 @@ #include "h263.h" #include "mpeg4video.h" #include "msmpeg4data.h" +#include "mpegvideodata.h" #include "vc1data.h" /* diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 20230f4..52be052 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -36,6 +36,7 @@ #include "mpeg_er.h" #include "mpegvideo.h" #include "mpeg4video.h" +#include "mpegvideodata.h" #define RV_GET_MAJOR_VER(x) ((x) >> 28) #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF) diff --git a/libavcodec/rv20enc.c b/libavcodec/rv20enc.c index 4462bde..dcb192f 100644 --- a/libavcodec/rv20enc.c +++ b/libavcodec/rv20enc.c @@ -26,6 +26,7 @@ */ #include "mpegvideo.h" +#include "mpegvideodata.h" #include "h263.h" #include "put_bits.h"

1 0

mpegvideo: msmpeg4: Move function declarations
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Fri May 29 19:44:02 2015 +0100| [31a117a0e6d6eafdf997bfe0843f3e3d39cc0332] | committer: Vittorio Giovara mpegvideo: msmpeg4: Move function declarations > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31a117a0e6d6eafdf… --- libavcodec/mpegvideo.h | 12 ------------ libavcodec/msmpeg4.h | 11 +++++++++++ libavcodec/mss2.c | 1 + libavcodec/vc1dec.c | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9c226cc..48c9cff 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -840,18 +840,6 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); int ff_rv_decode_dc(MpegEncContext *s, int n); void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); - -/* msmpeg4.c */ -void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number); -void ff_msmpeg4_encode_ext_header(MpegEncContext * s); -void ff_msmpeg4_encode_mb(MpegEncContext * s, - int16_t block[6][64], - int motion_x, int motion_y); -int ff_msmpeg4_decode_picture_header(MpegEncContext * s); -int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size); -int ff_msmpeg4_decode_init(AVCodecContext *avctx); -int ff_msmpeg4_encode_init(MpegEncContext *s); - int ff_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src); void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture); void ff_free_picture_tables(Picture *pic); diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index 23138dc..e57ae66 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -49,12 +49,23 @@ void ff_msmpeg4_handle_slices(MpegEncContext *s); void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr); + +int ff_msmpeg4_encode_init(MpegEncContext *s); +void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_msmpeg4_encode_ext_header(MpegEncContext *s); +void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], + int motion_x, int motion_y); + +int ff_msmpeg4_decode_init(AVCodecContext *avctx); +int ff_msmpeg4_decode_picture_header(MpegEncContext *s); +int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size); int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table); int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, int16_t **dc_val_ptr, int *dir_ptr); + #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ CONFIG_MSMPEG4V2_DECODER || \ CONFIG_MSMPEG4V3_DECODER || \ diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index d71d308..d1b72b3 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -27,6 +27,7 @@ #include "error_resilience.h" #include "internal.h" #include "mpeg_er.h" +#include "msmpeg4.h" #include "msmpeg4data.h" #include "qpeldsp.h" #include "vc1.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 2a252d3..53254f0 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -32,6 +32,7 @@ #include "internal.h" #include "mpeg_er.h" #include "mpegvideo.h" +#include "msmpeg4.h" #include "msmpeg4data.h" #include "vc1.h" #include "vc1data.h"

1 0

Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:09:38 2015 +0200| [f5ee10c16ac00f022e2f29bac3f51509e2799e02] | committer: Michael Niedermayer Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b' * commit '2f15846ad7ad57beb0bca99c624affa0facf284b': mpegvideo: wmv2: Move function declarations Conflicts: libavcodec/wmv2.h Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5ee10c16ac00f022… ---

1 0

Merge commit '902a55f7161ffea10e13c1e7df14022e2ed90514'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:08:14 2015 +0200| [f9dcf1690c7c74fb8f12183f6b60c22026d632dd] | committer: Michael Niedermayer Merge commit '902a55f7161ffea10e13c1e7df14022e2ed90514' * commit '902a55f7161ffea10e13c1e7df14022e2ed90514': dxva2_hevc: re-write reference frame handling See: 902a55f7161ffea10e13c1e7df14022e2ed90514 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9dcf1690c7c74fb8… ---

1 0

Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'
by git＠videolan.org 31 May '15

31 May '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jun 1 01:07:35 2015 +0200| [cdf6804056098757cc74ebce17752fb34771f06d] | committer: Michael Niedermayer Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a' * commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a': dxva2_hevc: fix 32x32 scaling lists See: b7a0b303d982eebd61ff07389bdef3f8b04c2c65 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdf6804056098757c… ---

1 0