generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a header

Browse Source 
It's a small and simple function that can be inlined.

This removes one private symbol and should reduce object dependencies with the next
major bump

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-07-25 12:09:22 -03:00
parent 26cb7232c3
commit 0c75bd8e3c
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/dnxhddata.c
View File

@ -22,7 +22,6 @@
#include "avcodec.h"
#include "dnxhddata.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
/* The quantization tables below are in zigzag order! */
@ -1103,12 +1102,12 @@ int avpriv_dnxhd_get_interlaced(int cid)
return ff_dnxhd_cid_table[i].flags & DNXHD_INTERLACED ? 1 : 0;
}
#if LIBAVCODEC_VERSION_MAJOR < 58
uint64_t avpriv_dnxhd_parse_header_prefix(const uint8_t *buf)
{
uint64_t prefix = AV_RB32(buf);
prefix = (prefix << 16) | buf[4] << 8;
return ff_dnxhd_check_header_prefix(prefix);
return ff_dnxhd_parse_header_prefix(buf);
}
#endif
static int dnxhd_find_hr_cid(AVCodecContext *avctx)
{

11
libavcodec/dnxhddata.h
View File

@ -25,6 +25,7 @@
#include <stdint.h>
#include "avcodec.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
/** Additional profile info flags */
#define DNXHD_INTERLACED (1<<0)
@ -83,7 +84,17 @@ static av_always_inline uint64_t ff_dnxhd_check_header_prefix(uint64_t prefix)
return 0;
}
static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf)
{
uint64_t prefix = AV_RB32(buf);
prefix = (prefix << 16) | buf[4] << 8;
return ff_dnxhd_check_header_prefix(prefix);
}
int avpriv_dnxhd_get_frame_size(int cid);
int avpriv_dnxhd_get_interlaced(int cid);
#if LIBAVCODEC_VERSION_MAJOR < 58
attribute_deprecated
uint64_t avpriv_dnxhd_parse_header_prefix(const uint8_t *buf);
#endif
#endif /* AVCODEC_DNXHDDATA_H */

2
libavcodec/dnxhddec.c
View File

@ -190,7 +190,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
return AVERROR_INVALIDDATA;
}
header_prefix = avpriv_dnxhd_parse_header_prefix(buf);
header_prefix = ff_dnxhd_parse_header_prefix(buf);
if (header_prefix == 0) {
av_log(ctx->avctx, AV_LOG_ERROR,
"unknown header 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",

2
libavformat/dnxhddec.c
View File

@ -30,7 +30,7 @@ static int dnxhd_probe(AVProbeData *p)
int w, h, compression_id;
if (p->buf_size < 0x2c)
return 0;
if (avpriv_dnxhd_parse_header_prefix(p->buf) == 0)
if (ff_dnxhd_parse_header_prefix(p->buf) == 0)
return 0;
h = AV_RB16(p->buf + 0x18);
w = AV_RB16(p->buf + 0x1a);

2
libavformat/movenc.c
View File

@ -1071,7 +1071,7 @@ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track)
int cid;
if (track->vos_data && track->vos_len > 0x29) {
if (avpriv_dnxhd_parse_header_prefix(track->vos_data) != 0) {
if (ff_dnxhd_parse_header_prefix(track->vos_data) != 0) {
/* looks like a DNxHD bit stream */
interlaced = (track->vos_data[5] & 2);
cid = AV_RB32(track->vos_data + 0x28);