Commit b47bc0da authored by Georgi Chorbadzhiyski's avatar Georgi Chorbadzhiyski

mpeg/psi: Update descriptor 0x04 (Hierarchy descriptor).

Update type table to match ISO/IEC 13818-1:2007(E).
parent f0409d01
......@@ -222,7 +222,7 @@ new PMT program=20000 version=1 pcrpid=110
* ES pid=120 streamtype=0x02 streamtype_txt="13818-2 video (MPEG-2)"
- desc 02 video_stream multiple_frame_rate=1 frame_rate_code=3 frame_rate_txt="25.00" mpeg1_only=1 constraint_parameter=1 still_picture=1
- desc 02 video_stream multiple_frame_rate=1 frame_rate_code=4 frame_rate_txt="29.97" mpeg1_only=0 constraint_parameter=1 still_picture=1 profile=4 profile_txt="Main" level=8 level_txt="Main" chroma_format=2 chroma_format_txt="4:2:2" frame_rate_extension=0
- desc 04 hierarchy type=1 type_txt="ITU-T Rec.H.262.0 | ISO/IEC 13818-2 Spatial Scalability" layer_index=6 embedded_layer_index=7 channel=8
- desc 04 hierarchy type=1 type_txt="Spatial Scalability" layer_index=6 embedded_layer_index=7 channel=8
- desc 05 registration identifier=TEST
- desc 06 data_stream_alignment alignment=2 alignment_txt="Video access unit"
- desc 07 target_background_grid horizontal_size=720 vertical_size=576 aspect_ratio_info=7
......
......@@ -386,7 +386,7 @@
<VIDEO_STREAM_DESC multiple_frame_rate="1" frame_rate_code="4" frame_rate_txt="29.97" mpeg1_only="0" constraint_parameter="1" still_picture="1" profile="4" profile_txt="Main" level="8" level_txt="Main" chroma_format="2" chroma_format_txt="4:2:2" frame_rate_extension="0"/>
</DESC>
<DESC id="0x04" length="4" value="f1c6c7c8">
<HIERARCHY_DESC type="1" type_txt="ITU-T Rec.H.262.0 | ISO/IEC 13818-2 Spatial Scalability" layer_index="6" embedded_layer_index="7" channel="8"/>
<HIERARCHY_DESC type="1" type_txt="Spatial Scalability" layer_index="6" embedded_layer_index="7" channel="8"/>
</DESC>
<DESC id="0x05" length="4" value="54455354">
<REGISTRATION_DESC identifier="TEST"/>
......
......@@ -95,13 +95,14 @@ static inline void desc04_set_channel(uint8_t *p_desc, uint8_t i_channel)
static inline char *desc04_get_type_txt(uint8_t i_type)
{
return i_type == 0 ? "reserved" :
i_type == 1 ? "ITU-T Rec.H.262.0 | ISO/IEC 13818-2 Spatial Scalability" :
i_type == 2 ? "ITU-T Rec.H.262.0 | ISO/IEC 13818-2 SNR Scalability" :
i_type == 3 ? "ITU-T Rec.H.262.0 | ISO/IEC 13818-2 Temporal Scalability" :
i_type == 4 ? "ITU-T Rec.H.262.0 | ISO/IEC 13818-2 Data paritioning" :
i_type == 5 ? "ISO/IEC 13818-3 Extension bitstream" :
i_type == 6 ? "ITU-T Rec.H.222.0 | ISO/IEC 13818-1 PrivateStream" :
i_type >= 7 && i_type <= 14 ? "reserved" :
i_type == 1 ? "Spatial Scalability" :
i_type == 2 ? "SNR Scalability" :
i_type == 3 ? "Temporal Scalability" :
i_type == 4 ? "Data paritioning" :
i_type == 5 ? "Extension bitstream" :
i_type == 6 ? "Private Stream" :
i_type == 7 ? "Multi-view Profile" :
i_type >= 8 && i_type <= 14 ? "reserved" :
i_type == 15 ? "base layer" : "unknown";
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment