virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/motion_est: Move ff_h263_round_chroma() to h263.h

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-19 13:26:37 +01:00
parent ec6c8e5273
commit 35fecd3e68
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h263.h
View File

@ -27,6 +27,16 @@
#define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4) #define H263_GOB_HEIGHT(h) ((h) <= 400 ? 1 : (h) <= 800 ? 2 : 4)
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);
}
av_const int ff_h263_aspect_to_info(AVRational aspect); av_const int ff_h263_aspect_to_info(AVRational aspect);
int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir, int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
int *px, int *py); int *px, int *py);

1
libavcodec/motion_est.c
View File

@ -32,6 +32,7 @@
#include <limits.h> #include <limits.h>
#include "avcodec.h" #include "avcodec.h"
#include "h263.h"
#include "mathops.h" #include "mathops.h"
#include "motion_est.h" #include "motion_est.h"
#include "mpegutils.h" #include "mpegutils.h"

10
libavcodec/motion_est.h
View File

@ -106,16 +106,6 @@ typedef struct MotionEstContext {
int size, int h); int size, int h);
} MotionEstContext; } 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);
}
/** /**
* Performs one-time initialization of the MotionEstContext. * Performs one-time initialization of the MotionEstContext.
*/ */

1
libavcodec/mpegvideo_dec.c
View File

@ -32,6 +32,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "decode.h" #include "decode.h"
#include "h263.h"
#include "h264chroma.h" #include "h264chroma.h"
#include "internal.h" #include "internal.h"
#include "mpegutils.h" #include "mpegutils.h"

1
libavcodec/mpegvideo_motion.c
View File

@ -29,6 +29,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "h261.h" #include "h261.h"
#include "h263.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpeg4videodec.h" #include "mpeg4videodec.h"