On Thu, 31 Jul 2014, Andrew Stone wrote:
Currently, only onMetadata is used, but some providers (wrongly) put metadata into onCuePoint events, and it's still nice to be able to use that data. --- libavformat/flvdec.c | 82 +++++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 40 deletions(-)diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 8e4cc5e..8d18dbe 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -438,45 +438,47 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, return -1; } - // only look for metadata values when we are not nested and key != NULL - if (depth == 1 && key) { - acodec = astream ? astream->codec : NULL; - vcodec = vstream ? vstream->codec : NULL; - - if (amf_type == AMF_DATA_TYPE_NUMBER || - amf_type == AMF_DATA_TYPE_BOOL) { - if (!strcmp(key, "duration")) - s->duration = num_val * AV_TIME_BASE; - else if (!strcmp(key, "videodatarate") && vcodec && - 0 <= (int)(num_val * 1024.0)) - vcodec->bit_rate = num_val * 1024.0; - else if (!strcmp(key, "audiodatarate") && acodec && - 0 <= (int)(num_val * 1024.0)) - acodec->bit_rate = num_val * 1024.0; - else if (!strcmp(key, "datastream")) { - AVStream *st = create_stream(s, AVMEDIA_TYPE_DATA); - if (!st) - return AVERROR(ENOMEM); - st->codec->codec_id = AV_CODEC_ID_TEXT; - } else if (flv->trust_metadata) { - if (!strcmp(key, "videocodecid") && vcodec) { - flv_set_video_codec(s, vstream, num_val, 0); - } else if (!strcmp(key, "audiocodecid") && acodec) { - int id = ((int)num_val) << FLV_AUDIO_CODECID_OFFSET; - flv_set_audio_codec(s, astream, acodec, id); - } else if (!strcmp(key, "audiosamplerate") && acodec) { - acodec->sample_rate = num_val; - } else if (!strcmp(key, "audiosamplesize") && acodec) { - acodec->bits_per_coded_sample = num_val; - } else if (!strcmp(key, "stereo") && acodec) { - acodec->channels = num_val + 1; - acodec->channel_layout = acodec->channels == 2 ? - AV_CH_LAYOUT_STEREO : - AV_CH_LAYOUT_MONO; - } else if (!strcmp(key, "width") && vcodec) { - vcodec->width = num_val; - } else if (!strcmp(key, "height") && vcodec) { - vcodec->height = num_val; + if (key) { + // stream info doesn't live any deeper than the first object + if (depth == 1) { + acodec = astream ? astream->codec : NULL; + vcodec = vstream ? vstream->codec : NULL; + + if (amf_type == AMF_DATA_TYPE_NUMBER || + amf_type == AMF_DATA_TYPE_BOOL) { + if (!strcmp(key, "duration")) + s->duration = num_val * AV_TIME_BASE; + else if (!strcmp(key, "videodatarate") && vcodec && + 0 <= (int)(num_val * 1024.0)) + vcodec->bit_rate = num_val * 1024.0; + else if (!strcmp(key, "audiodatarate") && acodec && + 0 <= (int)(num_val * 1024.0)) + acodec->bit_rate = num_val * 1024.0; + else if (!strcmp(key, "datastream")) { + AVStream *st = create_stream(s, AVMEDIA_TYPE_DATA); + if (!st) + return AVERROR(ENOMEM); + st->codec->codec_id = AV_CODEC_ID_TEXT; + } else if (flv->trust_metadata) { + if (!strcmp(key, "videocodecid") && vcodec) { + flv_set_video_codec(s, vstream, num_val, 0); + } else if (!strcmp(key, "audiocodecid") && acodec) { + int id = ((int)num_val) << FLV_AUDIO_CODECID_OFFSET; + flv_set_audio_codec(s, astream, acodec, id); + } else if (!strcmp(key, "audiosamplerate") && acodec) { + acodec->sample_rate = num_val; + } else if (!strcmp(key, "audiosamplesize") && acodec) { + acodec->bits_per_coded_sample = num_val; + } else if (!strcmp(key, "stereo") && acodec) { + acodec->channels = num_val + 1; + acodec->channel_layout = acodec->channels == 2 ? + AV_CH_LAYOUT_STEREO : + AV_CH_LAYOUT_MONO; + } else if (!strcmp(key, "width") && vcodec) { + vcodec->width = num_val; + } else if (!strcmp(key, "height") && vcodec) { + vcodec->height = num_val; + } } } } @@ -533,7 +535,7 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) if (!strcmp(buffer, "onTextData")) return 1; - if (strcmp(buffer, "onMetaData")) + if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint")) return -1; // find the streams now so that amf_parse_object doesn't need to do -- 2.0.1
This feels like two separate changes to me, or I haven't thought enough about it. The commit message describes the second hunk, but could you explain in the commit message (or split to a separate patch) what the first hunk of the patch actually does related to the rest?
// Martin _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
