virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684'

Browse Source 
* commit '5956f489d0452ff6dea6b6b81b4fa8e596fc5684':
  rtpdec_hevc: Add asterisks at the start of each long comment line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-24 22:55:51 +01:00
parent 3804d73e46 5956f489d0
commit df38883607
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libavformat/rtpdec_hevc.c
View File

@@ -228,19 +228,19 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
} }
/* /*
decode the HEVC payload header according to section 4 of draft version 6: * decode the HEVC payload header according to section 4 of draft version 6:
*
0 1 * 0 1
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|F| Type | LayerId | TID | * |F| Type | LayerId | TID |
+-------------+-----------------+ * +-------------+-----------------+
*
Forbidden zero (F): 1 bit * Forbidden zero (F): 1 bit
NAL unit type (Type): 6 bits * NAL unit type (Type): 6 bits
NUH layer ID (LayerId): 6 bits * NUH layer ID (LayerId): 6 bits
NUH temporal ID plus 1 (TID): 3 bits * NUH temporal ID plus 1 (TID): 3 bits
*/ */
nal_type = (buf[0] >> 1) & 0x3f; nal_type = (buf[0] >> 1) & 0x3f;
lid = ((buf[0] << 5) & 0x20) | ((buf[1] >> 3) & 0x1f); lid = ((buf[0] << 5) & 0x20) | ((buf[1] >> 3) & 0x1f);
tid = buf[1] & 0x07; tid = buf[1] & 0x07;
@@ -318,17 +318,17 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx
len -= RTP_HEVC_PAYLOAD_HEADER_SIZE; len -= RTP_HEVC_PAYLOAD_HEADER_SIZE;
/* /*
decode the FU header * decode the FU header
*
0 1 2 3 4 5 6 7 * 0 1 2 3 4 5 6 7
+-+-+-+-+-+-+-+-+ * +-+-+-+-+-+-+-+-+
|S|E| FuType | * |S|E| FuType |
+---------------+ * +---------------+
*
Start fragment (S): 1 bit * Start fragment (S): 1 bit
End fragment (E): 1 bit * End fragment (E): 1 bit
FuType: 6 bits * FuType: 6 bits
*/ */
first_fragment = buf[0] & 0x80; first_fragment = buf[0] & 0x80;
last_fragment = buf[0] & 0x40; last_fragment = buf[0] & 0x40;
fu_type = buf[0] & 0x3f; fu_type = buf[0] & 0x3f;