virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: fix usages of av_get_codec_tag_string()

Browse Source
This commit is contained in:
Clément Bœsch 2017-03-27 01:31:37 +02:00
parent f156d35321
commit 67e370ee52
5 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/dds.c
View File

@ -117,7 +117,6 @@ static int parse_pixel_format(AVCodecContext *avctx)
{
DDSContext *ctx = avctx->priv_data;
GetByteContext *gbc = &ctx->gbc;
char buf[32];
uint32_t flags, fourcc, gimp_tag;
enum DDSDXGIFormat dxgi;
int size, bpp, r, g, b, a;
@ -161,13 +160,10 @@ static int parse_pixel_format(AVCodecContext *avctx)
bytestream2_skip(gbc, 4); // caps4
bytestream2_skip(gbc, 4); // reserved2
av_get_codec_tag_string(buf, sizeof(buf), fourcc);
av_log(avctx, AV_LOG_VERBOSE, "fourcc %s bpp %d "
"r 0x%x g 0x%x b 0x%x a 0x%x\n", buf, bpp, r, g, b, a);
if (gimp_tag) {
av_get_codec_tag_string(buf, sizeof(buf), gimp_tag);
av_log(avctx, AV_LOG_VERBOSE, "and GIMP-DDS tag %s\n", buf);
}
"r 0x%x g 0x%x b 0x%x a 0x%x\n", av_fourcc2str(fourcc), bpp, r, g, b, a);
if (gimp_tag)
av_log(avctx, AV_LOG_VERBOSE, "and GIMP-DDS tag %s\n", av_fourcc2str(gimp_tag));
if (ctx->compressed)
avctx->pix_fmt = AV_PIX_FMT_RGBA;
@ -344,7 +340,7 @@ static int parse_pixel_format(AVCodecContext *avctx)
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "Unsupported %s fourcc.\n", buf);
av_log(avctx, AV_LOG_ERROR, "Unsupported %s fourcc.\n", av_fourcc2str(fourcc));
return AVERROR_INVALIDDATA;
}
} else if (ctx->paletted) {

8
libavcodec/mjpegdec.c
View File

@ -1649,11 +1649,9 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
id = get_bits_long(&s->gb, 32);
len -= 6;
if (s->avctx->debug & FF_DEBUG_STARTCODE) {
char id_str[32];
av_get_codec_tag_string(id_str, sizeof(id_str), av_bswap32(id));
av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n", id_str, id, len);
}
if (s->avctx->debug & FF_DEBUG_STARTCODE)
av_log(s->avctx, AV_LOG_DEBUG, "APPx (%s / %8X) len=%d\n",
av_fourcc2str(av_bswap32(id)), id, len);
/* Buggy AVID, it puts EOI only at every 10th frame. */
/* Also, this fourcc is used by non-avid files too, it holds some

15
libavcodec/mmaldec.c
View File

@ -228,9 +228,8 @@ static void control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
status = *(uint32_t *)buffer->data;
av_log(avctx, AV_LOG_ERROR, "MMAL error %d on control port\n", (int)status);
} else {
char s[20];
av_get_codec_tag_string(s, sizeof(s), buffer->cmd);
av_log(avctx, AV_LOG_WARNING, "Unknown MMAL event %s on control port\n", s);
av_log(avctx, AV_LOG_WARNING, "Unknown MMAL event %s on control port\n",
av_fourcc2str(buffer->cmd));
}
mmal_buffer_header_release(buffer);
@ -352,7 +351,6 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
MMAL_STATUS_T status;
MMAL_ES_FORMAT_T *format_in;
MMAL_COMPONENT_T *decoder;
char tmp[32];
int ret = 0;
bcm_host_init();
@ -399,8 +397,8 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
format_in->es->video.par.den = avctx->sample_aspect_ratio.den;
format_in->flags = MMAL_ES_FORMAT_FLAG_FRAMED;
av_get_codec_tag_string(tmp, sizeof(tmp), format_in->encoding);
av_log(avctx, AV_LOG_DEBUG, "Using MMAL %s encoding.\n", tmp);
av_log(avctx, AV_LOG_DEBUG, "Using MMAL %s encoding.\n",
av_fourcc2str(format_in->encoding));
#if HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS
if (mmal_port_parameter_set_uint32(decoder->input[0], MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS,
@ -742,9 +740,8 @@ static int ffmmal_read_frame(AVCodecContext *avctx, AVFrame *frame, int *got_fra
mmal_buffer_header_release(buffer);
continue;
} else if (buffer->cmd) {
char s[20];
av_get_codec_tag_string(s, sizeof(s), buffer->cmd);
av_log(avctx, AV_LOG_WARNING, "Unknown MMAL event %s on output port\n", s);
av_log(avctx, AV_LOG_WARNING, "Unknown MMAL event %s on output port\n",
av_fourcc2str(buffer->cmd));
goto done;
} else if (buffer->length == 0) {
// Unused output buffer that got drained after format change.

4
libavcodec/sheervideo.c
View File

@ -2879,7 +2879,6 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame *p = data;
GetBitContext gb;
unsigned format;
char format_str[32];
int ret;
if (avpkt->size <= 20)
@ -2891,8 +2890,7 @@ static int decode_frame(AVCodecContext *avctx,
s->alt = 0;
format = AV_RL32(avpkt->data + 16);
av_get_codec_tag_string(format_str, sizeof(format_str), format);
av_log(avctx, AV_LOG_DEBUG, "format: %s\n", format_str);
av_log(avctx, AV_LOG_DEBUG, "format: %s\n", av_fourcc2str(format));
switch (format) {
case MKTAG(' ', 'R', 'G', 'B'):
avctx->pix_fmt = AV_PIX_FMT_RGB0;

9
libavcodec/utils.c
View File

@ -3256,12 +3256,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
", %d reference frame%s",
enc->refs, enc->refs > 1 ? "s" : "");
if (enc->codec_tag) {
char tag_buf[32];
av_get_codec_tag_string(tag_buf, sizeof(tag_buf), enc->codec_tag);
snprintf(buf + strlen(buf), buf_size - strlen(buf),
" (%s / 0x%04X)", tag_buf, enc->codec_tag);
}
if (enc->codec_tag)
snprintf(buf + strlen(buf), buf_size - strlen(buf), " (%s / 0x%04X)",
av_fourcc2str(enc->codec_tag), enc->codec_tag);
switch (enc->codec_type) {
case AVMEDIA_TYPE_VIDEO: