virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Code Issues Releases Activity

rtpdec_vp9: Update header parsing to spec draft 02

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2016-04-27 14:36:24 +03:00
parent 33b83d89e3
commit 70c77fdfc1
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/rtpdec_vp9.c
View File

@ -1,5 +1,5 @@
/* /*
* RTP parser for VP9 payload format (draft version 0) - experimental * RTP parser for VP9 payload format (draft version 02) - experimental
* Copyright (c) 2015 Thomas Volkert <thomas@homer-conferencing.com> * Copyright (c) 2015 Thomas Volkert <thomas@homer-conferencing.com>
* *
* This file is part of Libav. * This file is part of Libav.
@ -45,8 +45,8 @@ static int vp9_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_vp9_ctx,
const uint8_t *buf, int len, uint16_t seq, const uint8_t *buf, int len, uint16_t seq,
int flags) int flags)
{ {
int has_pic_id, has_layer_idc, has_ref_idc, has_ss_data, has_su_data; int has_pic_id, has_layer_idc, has_ref_idc, has_ss_data;
av_unused int pic_id = 0, non_key_frame = 0; av_unused int pic_id = 0, non_key_frame = 0, inter_picture_layer_frame;
av_unused int layer_temporal = -1, layer_spatial = -1, layer_quality = -1; av_unused int layer_temporal = -1, layer_spatial = -1, layer_quality = -1;
int ref_fields = 0, has_ref_field_ext_pic_id = 0; int ref_fields = 0, has_ref_field_ext_pic_id = 0;
int first_fragment, last_fragment; int first_fragment, last_fragment;
@ -68,24 +68,24 @@ static int vp9_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_vp9_ctx,
* *
* 0 1 2 3 4 5 6 7 * 0 1 2 3 4 5 6 7
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
* |I|L|F|B|E|V|U|-| (REQUIRED) * |I|P|L|F|B|E|V|-| (REQUIRED)
* +-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
* *
* I: PictureID present * I: PictureID present
* P: Inter-picture predicted layer frame
* L: Layer indices present * L: Layer indices present
* F: Reference indices present * F: Flexible mode
* B: Start of VP9 frame * B: Start of VP9 frame
* E: End of picture * E: End of picture
* V: Scalability Structure (SS) present * V: Scalability Structure (SS) present
* U: Scalability Structure Update (SU) present
*/ */
has_pic_id = !!(buf[0] & 0x80); has_pic_id = !!(buf[0] & 0x80);
has_layer_idc = !!(buf[0] & 0x40); inter_picture_layer_frame = !!(buf[0] & 0x40);
has_ref_idc = !!(buf[0] & 0x20); has_layer_idc = !!(buf[0] & 0x20);
first_fragment = !!(buf[0] & 0x10); has_ref_idc = !!(buf[0] & 0x10);
last_fragment = !!(buf[0] & 0x08); first_fragment = !!(buf[0] & 0x08);
has_ss_data = !!(buf[0] & 0x04); last_fragment = !!(buf[0] & 0x04);
has_su_data = !!(buf[0] & 0x02); has_ss_data = !!(buf[0] & 0x02);
rtp_m = !!(flags & RTP_FLAG_MARKER); rtp_m = !!(flags & RTP_FLAG_MARKER);
@ -226,16 +226,6 @@ static int vp9_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_vp9_ctx,
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
/*
* decode the scalability update structure (SU)
*
* spec. is tbd
*/
if (has_su_data) {
avpriv_report_missing_feature(ctx, "VP9 scalability update structure data");
return AVERROR(ENOSYS);
}
/* /*
* decode the VP9 payload header * decode the VP9 payload header
* *