LAV
/
libbluray
1
0
Fork 0
Code

Add HEVC/2160p video format

This commit is contained in:
hpi1 2017-08-28 09:50:43 +03:00
parent 0c2451b041
commit 14aa7e9c0f
7 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/devtools/clpi_dump.c
View File

@ -63,6 +63,7 @@ _show_stream(CLPI_PROG_STREAM *ss, int level)
case 0xea:
case 0x1b:
case 0x20:
case 0x24:
indent_printf(level, "Format %02x: %s", ss->format,
_lookup_str(video_format_map, ss->format));
indent_printf(level, "Rate %02x: %s", ss->rate,

1
src/devtools/mpls_dump.c
View File

@ -115,6 +115,7 @@ _show_stream(MPLS_STREAM *ss, int level)
case 0x02:
case 0xea:
case 0x1b:
case 0x24:
indent_printf(level, "Format %02x: %s", ss->format,
_lookup_str(video_format_map, ss->format));
indent_printf(level, "Rate %02x: %s", ss->rate,

2
src/devtools/strings.h
View File

@ -39,6 +39,7 @@ const VALUE_MAP codec_map[] = {
{0xea, "VC-1"},
{0x1b, "H.264"},
{0x20, "H.264 MVC dep."},
{0x24, "HEVC"},
{0x90, "Presentation Graphics"},
{0x91, "Presentation Graphics"},
{0x92, "Interactive Graphics"},
@ -54,6 +55,7 @@ const VALUE_MAP video_format_map[] = {
{5, "720p"},
{6, "1080p"},
{7, "576p"},
{8, "2160p"},
{0, NULL}
};

2
src/libbluray/bdnav/bdparse.h
View File

@ -37,6 +37,7 @@
#define BD_STREAM_TYPE_AUDIO_DTSHD_MASTER 0x86
#define BD_STREAM_TYPE_VIDEO_VC1 0xea
#define BD_STREAM_TYPE_VIDEO_H264 0x1b
#define BD_STREAM_TYPE_VIDEO_HEVC 0x24
#define BD_STREAM_TYPE_SUB_PG 0x90
#define BD_STREAM_TYPE_SUB_IG 0x91
#define BD_STREAM_TYPE_SUB_TEXT 0x92
@ -48,6 +49,7 @@
#define BD_VIDEO_FORMAT_720P 5 // SMPTE 296M
#define BD_VIDEO_FORMAT_1080P 6 // SMPTE 274M
#define BD_VIDEO_FORMAT_576P 7 // ITU-R BT.1358
#define BD_VIDEO_FORMAT_2160P 8
#define BD_VIDEO_RATE_24000_1001 1 // 23.976
#define BD_VIDEO_RATE_24 2

1
src/libbluray/bdnav/clpi_parse.c
View File

@ -75,6 +75,7 @@ _parse_stream_attr(BITSTREAM *bits, CLPI_PROG_STREAM *ss)
case 0xea:
case 0x1b:
case 0x20:
case 0x24:
ss->format = bs_read(bits, 4);
ss->rate = bs_read(bits, 4);
ss->aspect = bs_read(bits, 4);

1
src/libbluray/bdnav/mpls_parse.c
View File

@ -183,6 +183,7 @@ _parse_stream(BITSTREAM *bits, MPLS_STREAM *s)
case 0x02:
case 0xea:
case 0x1b:
case 0x24:
s->format = bs_read(bits, 4);
s->rate = bs_read(bits, 4);
break;

4
src/libbluray/bluray.h
View File

@ -140,6 +140,7 @@ typedef enum {
BLURAY_STREAM_TYPE_AUDIO_DTSHD_MASTER = 0x86,
BLURAY_STREAM_TYPE_VIDEO_VC1 = 0xea,
BLURAY_STREAM_TYPE_VIDEO_H264 = 0x1b,
BLURAY_STREAM_TYPE_VIDEO_HEVC = 0x24,
BLURAY_STREAM_TYPE_SUB_PG = 0x90,
BLURAY_STREAM_TYPE_SUB_IG = 0x91,
BLURAY_STREAM_TYPE_SUB_TEXT = 0x92,
@ -154,7 +155,8 @@ typedef enum {
BLURAY_VIDEO_FORMAT_1080I = 4, // SMPTE 274M
BLURAY_VIDEO_FORMAT_720P = 5, // SMPTE 296M
BLURAY_VIDEO_FORMAT_1080P = 6, // SMPTE 274M
BLURAY_VIDEO_FORMAT_576P = 7 // ITU-R BT.1358
BLURAY_VIDEO_FORMAT_576P = 7, // ITU-R BT.1358
BLURAY_VIDEO_FORMAT_2160P = 8, //
} bd_video_format_e;
typedef enum {