Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvmerge: clarify description of several MPEG audio & video format names

Browse Source 
Fixes #1275.
This commit is contained in:
Moritz Bunkus 2019-04-22 15:51:29 +02:00
parent d9c9b2498f
commit 002daadc0a
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/file_types.cpp
View File

@ -41,10 +41,10 @@ file_type_t::get_supported() {
s_supported_file_types.emplace_back(file_type_e::hevc_es, Y("HEVC/h.265 elementary streams"), "265 hevc h265 x265");
s_supported_file_types.emplace_back(file_type_e::ivf, Y("IVF (AV1, VP8, VP9)"), "ivf");
s_supported_file_types.emplace_back(file_type_e::qtmp4, Y("MP4 audio/video files"), "mp4 m4v");
s_supported_file_types.emplace_back(file_type_e::mp3, Y("MPEG audio files"), "mp2 mp3");
s_supported_file_types.emplace_back(file_type_e::mp3, Y("MPEG-1/2 Audio Layer II/III elementary streams"), "mp2 mp3");
s_supported_file_types.emplace_back(file_type_e::mpeg_ps, Y("MPEG program streams"), "mpg mpeg m2v mpv evo evob vob");
s_supported_file_types.emplace_back(file_type_e::mpeg_ts, Y("MPEG transport streams"), "ts m2ts mts");
s_supported_file_types.emplace_back(file_type_e::mpeg_es, Y("MPEG video elementary streams"), "m1v m2v mpv");
s_supported_file_types.emplace_back(file_type_e::mpeg_es, Y("MPEG-1/2 video elementary streams"), "m1v m2v mpv");
s_supported_file_types.emplace_back(file_type_e::is_unknown, Y("MPLS Blu-ray playlist"), "mpls");
s_supported_file_types.emplace_back(file_type_e::matroska, Y("Matroska audio/video files"), "mka mks mkv mk3d webm webmv webma");
s_supported_file_types.emplace_back(file_type_e::pgssup, Y("PGS/SUP subtitles"), "sup");
@ -90,8 +90,8 @@ file_type_t::get_name(file_type_e type) {
: file_type_e::ivf == type ? YT("IVF (AV1, VP8, VP9)")
: file_type_e::matroska == type ? YT("Matroska")
: file_type_e::microdvd == type ? YT("MicroDVD")
: file_type_e::mp3 == type ? YT("MP2/MP3")
: file_type_e::mpeg_es == type ? YT("MPEG video elementary stream")
: file_type_e::mp3 == type ? YT("MPEG-1/2 Audio Layer II/III")
: file_type_e::mpeg_es == type ? YT("MPEG-1/2 video elementary stream")
: file_type_e::mpeg_ps == type ? YT("MPEG program stream")
: file_type_e::mpeg_ts == type ? YT("MPEG transport stream")
: file_type_e::obu == type ? YT("Open Bitstream Units stream")

2
src/output/p_mp3.h
View File

@ -41,7 +41,7 @@ public:
virtual void set_headers();
virtual translatable_string_c get_format_name() const {
return YT("MP3");
return YT("MPEG-1/2 Audio Layer II/III");
}
virtual connection_result_e can_connect_to(generic_packetizer_c *src, std::string &error_message);

2
src/output/p_mpeg1_2.h
View File

@ -34,7 +34,7 @@ public:
virtual int process(packet_cptr packet);
virtual translatable_string_c get_format_name() const {
return YT("MPEG-1/2");
return YT("MPEG-1/2 video");
}
protected:

6
tests/results.txt
View File

@ -63,7 +63,7 @@ T_213mp4_broken_pixel_dimensions:7876ded7de0b259441c9ee2ef1d8be34:passed:2005091
T_214one_frame_avi:3d552bd8e473b182aa4f949bbd3e82a0:passed:20051004-192755:0.039489971
T_215X_codec_extradata_avi:0812a10d2d67cf7a74c6fd5128408a81-74ac799ad899f703cbb6c6654e5f9f51:passed:20051004-194707:0.052219855
T_216mp4_editlists:86d06542f114fceb6ea1c664b0fc5d61:passed:20051118-191453:0.106975045
T_217file_identification:f301f43cf937758f724b7e93f852b42b-ec38690afad809e3c34e8b10901c6950-1c5f404508ab7ad7754cf4100e8ff4c5-cf6010997916ead3c56e5913f1fbd141-dcaa49cb0a5daa4d343e74b3c268c894-28dcbec43cb2dbf63f23cf88dd4f7985-9deb4d4105ad8bef8a09933e59775794-7260e9290e58ae3e702e8af162deeecc-53259f181b2153fd62ce8d5981bef688-700e74dcc7ae61064d9ac54d95afebf1-7c6fb6145548d4411f96857949c96788-a95da0823737b2e6d34e638a007dd4ce-7ab19171942fc96858d046c022780f1e-03f9cc6642c8bb71e937b1e02af7e726-b534aae2da2fc87e9f910717259f6462-cfa455a14d3755bf64082b04b712be8b-6dd9ede82b86274d64efe9680cd427f5-5a97b110b8ea0b50584ee759f25c4fad-a072268580c8c65474ea6c8ee4f48c8d-d8aa5ca981a3b201935b70819012efa6-aabd820a44e7f3d18106339b65994c53-212db91754ac44fe123eafb2a581b06c:passed:20051209-180815:1.882517588
T_217file_identification:f301f43cf937758f724b7e93f852b42b-ec38690afad809e3c34e8b10901c6950-1c5f404508ab7ad7754cf4100e8ff4c5-cf6010997916ead3c56e5913f1fbd141-dcaa49cb0a5daa4d343e74b3c268c894-28dcbec43cb2dbf63f23cf88dd4f7985-9deb4d4105ad8bef8a09933e59775794-7260e9290e58ae3e702e8af162deeecc-53259f181b2153fd62ce8d5981bef688-700e74dcc7ae61064d9ac54d95afebf1-7c6fb6145548d4411f96857949c96788-a95da0823737b2e6d34e638a007dd4ce-7ab19171942fc96858d046c022780f1e-03f9cc6642c8bb71e937b1e02af7e726-b534aae2da2fc87e9f910717259f6462-0b80238b44d677b13ae4250e78aabb55-6dd9ede82b86274d64efe9680cd427f5-5a97b110b8ea0b50584ee759f25c4fad-a072268580c8c65474ea6c8ee4f48c8d-d8aa5ca981a3b201935b70819012efa6-aabd820a44e7f3d18106339b65994c53-212db91754ac44fe123eafb2a581b06c:passed:20051209-180815:1.882517588
T_218theora:0805c9249d51e4977816e93225c86017-60b04133e34e981adb27b6fcaae038c6:passed:20060428-105054:0.392912102
T_219srt_short_timecodes:0c613e64f973f970f979ed8da3b68290:passed:20060926-112658:0.117747192
T_220ass_with_comments_at_start:0155e6ca3613ce1d9a1ea3a08505b804:passed:20060926-120101:0.382410266
@ -367,9 +367,9 @@ T_518mlp:d503608ccdc7b0704297613aa897e4cf-aff60662f456f850e8b23adfdf31254d:passe
T_519truehd:762f9b649e70c8b8a738c9ebdc85c002-762f9b649e70c8b8a738c9ebdc85c002:passed:20151229-135950:3.160459472
T_520truehd_mlp_atmos_detection:933082e71876ab5c89ce44aff9638f0e+true-d034d80ecde122fcfb1026b43a9b7032+true-af66c888721d3db496ddbeef57f7b2b6+true-7651394bf8e7025e83da2372eac987c3+true-11c6f58c45a82dec754d753a32b93e4c+true-100d3563880ec3050601c14ce8b38ac7+true:passed:20151229-160649:2.357134495
T_521mp4_edit_list_constant_offset_with_segment_duration_not_0:931d31236a4b8f35e9aff1d83a821e93:passed:20151228-185646:0.621563048
T_522mpeg_1_2_es_no_start_code_at_beginning:e58483f6c8df68a4b9a0399aa0d90079:passed:20151230-182435:0.299243222
T_522mpeg_1_2_es_no_start_code_at_beginning:cf63c8454526e94c6947a0b72e7963cf:passed:20151230-182435:0.299243222
T_523mpeg_ts_pes_size_0:740306e343d82b5914d558fc2e5f8cae-35a8e3a06d95bb550f6e487ed5983955:passed:20151230-221825:1.635929691
T_524mpeg2_misdetected_as_truehd:d9e0fc9e1950d043233788b58badae5a:passed:20160102-222743:1.10526128
T_524mpeg2_misdetected_as_truehd:dacc8284272cc17cb3915b479b4f771a:passed:20160102-222743:1.10526128
T_525truehd_doesnt_start_with_sync_frame:90300695ef1b9a99d4820f1e8432fc61:passed:20160104-205804:0.313378755
T_526propedit_bibliographic_and_terminology_iso_639_2:66a83393897d332c1b92a4f19db407c1-db5d063a6e3c4e6c7dfca5b6eb2de4ae-66a83393897d332c1b92a4f19db407c1-db5d063a6e3c4e6c7dfca5b6eb2de4ae:passed:20160108-105234:0.538417963
T_527quicktime_v1_sound_stsd_zero_values:256ba7770ca037e2a3b008d492ce242d:passed:20160117-112706:0.011153053