RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

get_bits: move check_marker() to mpegvideodec.h 

It is only used by mpegvideo-based decoders - specifically mpeg12, intelh263,
ituh263, mpeg4video.
This commit is contained in:
Anton Khirnov 2021-01-27 19:06:36 +01:00
parent 8cfb44cd2e
commit c9a2506de9
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/get_bits.h
View File

@ -31,7 +31,6 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "defs.h" #include "defs.h"
@ -610,16 +609,6 @@ static inline unsigned int show_bits_long(GetBitContext *s, int n)
} }
} }
static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
{
int bit = get_bits1(s);
if (!bit)
av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
get_bits_count(s) - 1, s->size_in_bits, msg);
return bit;
}
static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer, static inline int init_get_bits_xe(GetBitContext *s, const uint8_t *buffer,
int bit_size, int is_le) int bit_size, int is_le)
{ {

1
libavcodec/intelh263dec.c
View File

@ -21,6 +21,7 @@
#include "codec_internal.h" #include "codec_internal.h"
#include "mpegutils.h" #include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "mpegvideodec.h"
#include "h263data.h" #include "h263data.h"
#include "h263dec.h" #include "h263dec.h"
#include "mpegvideodata.h" #include "mpegvideodata.h"

1
libavcodec/ituh263dec.c
View File

@ -48,6 +48,7 @@
#include "rv10dec.h" #include "rv10dec.h"
#include "mpeg4video.h" #include "mpeg4video.h"
#include "mpegvideodata.h" #include "mpegvideodata.h"
#include "mpegvideodec.h"
#include "mpeg4videodec.h" #include "mpeg4videodec.h"
// The defines below define the number of bits that are read at once for // The defines below define the number of bits that are read at once for

12
libavcodec/mpegvideodec.h
View File

@ -29,6 +29,8 @@
#define AVCODEC_MPEGVIDEODEC_H #define AVCODEC_MPEGVIDEODEC_H
#include "libavutil/frame.h" #include "libavutil/frame.h"
#include "libavutil/log.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "mpegpicture.h" #include "mpegpicture.h"
@ -67,4 +69,14 @@ static inline int mpeg_get_qscale(MpegEncContext *s)
return qscale << 1; return qscale << 1;
} }
static inline int check_marker(void *logctx, GetBitContext *s, const char *msg)
{
int bit = get_bits1(s);
if (!bit)
av_log(logctx, AV_LOG_INFO, "Marker bit missing at %d of %d %s\n",
get_bits_count(s) - 1, s->size_in_bits, msg);
return bit;
}
#endif /* AVCODEC_MPEGVIDEODEC_H */ #endif /* AVCODEC_MPEGVIDEODEC_H */