From 8b6b25220d331dccf589e35be04f591467d8d249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Tue, 22 May 2012 23:36:47 +0200 Subject: decoder/ffmpeg: add webm as a supported format --- NEWS | 2 ++ src/decoder/ffmpeg_decoder_plugin.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 16f08e216..00972bab4 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.16.9 (2012/??/??) +* decoder: + - ffmpeg: support WebM ver 0.16.8 (2012/04/04) diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 2929d316a..3bb3a07b6 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -745,7 +745,8 @@ static const char *const ffmpeg_suffixes[] = { "ram", "rl2", "rm", "rmvb", "roq", "rpl", "rvc", "shn", "smk", "snd", "sol", "son", "spx", "str", "swf", "tgi", "tgq", "tgv", "thp", "ts", "tsp", "tta", "xa", "xvid", "uv", "uv2", "vb", "vid", "vob", "voc", - "vp6", "vmd", "wav", "wma", "wmv", "wsaud", "wsvga", "wv", "wve", + "vp6", "vmd", "wav", "webm", "wma", "wmv", "wsaud", "wsvga", "wv", + "wve", NULL }; @@ -809,6 +810,7 @@ static const char *const ffmpeg_mime_types[] = { "video/msvideo", "video/ogg", "video/theora", + "video/webm", "video/x-dv", "video/x-flv", "video/x-matroska", -- cgit v1.2.3 From cca9bc51761b0d2a9dc0f2a6cc6bf24139862372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Tue, 22 May 2012 23:40:43 +0200 Subject: decoder/ffmpeg: improve "decoding failed" message "Frame skipped" might cause the impression that the decoding of a whole song failed. --- src/decoder/ffmpeg_decoder_plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c index 3bb3a07b6..d1e1470ac 100644 --- a/src/decoder/ffmpeg_decoder_plugin.c +++ b/src/decoder/ffmpeg_decoder_plugin.c @@ -344,7 +344,7 @@ ffmpeg_send_packet(struct decoder *decoder, struct input_stream *is, if (len < 0) { /* if error, we skip the frame */ - g_message("decoding failed\n"); + g_message("decoding failed, frame skipped\n"); break; } -- cgit v1.2.3 From 6bb166aaaa387f20aca469b6463ba1ad96942d06 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 May 2012 22:52:50 +0200 Subject: decoder_api: log the decoder plugin name --- src/decoder_thread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/decoder_thread.c b/src/decoder_thread.c index bb3ef9348..edd726d38 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -115,6 +115,8 @@ decoder_stream_decode(const struct decoder_plugin *plugin, assert(input_stream->ready); assert(decoder->dc->state == DECODE_STATE_START); + g_debug("probing plugin %s", plugin->name); + if (decoder->dc->command == DECODE_COMMAND_STOP) return true; @@ -146,6 +148,8 @@ decoder_file_decode(const struct decoder_plugin *plugin, assert(g_path_is_absolute(path)); assert(decoder->dc->state == DECODE_STATE_START); + g_debug("probing plugin %s", plugin->name); + if (decoder->dc->command == DECODE_COMMAND_STOP) return true; -- cgit v1.2.3