RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
master
ffmpeg/tests/ref/fate/matroska-stereo_mode

216 lines
7.4 KiB
Plaintext
Raw Permalink Normal View History

avformat/matroskaenc: Don't add side-data to input stream When muxing, the AVStreams' side-data is typically set by the caller before avformat_write_header(); it is not documented to be else. Yet the Matroska muxer added an AVStereo3D side data if certain metadata was present: Since commit 4d686fb721b485ebbc4c7779d927d876c1e630f7 (adding support for AVStereo3D stream side-data), the Matroska muxer checked certain stream tags that contain Matroska's StereoMode and (if they are present) converted this value into an AVStereo3D struct that gets attached to the AVStream (reusing a function from the demuxer). Afterwards the AVStereo3D side data struct (whether it has just been added by the muxer or not) gets parsed and converted back into a Matroska StereoMode. Besides being an API violation this change broke StereoMode values without a corresponding AVStereo3D (namely the anaglyph ones). This commit fixes this: A StereoMode given via tags is now used-as-is; if no such tag exists and an AVStereo3D side data exists, it is converted into the corresponding StereoMode (if possible). This approach also fixes handling of the anaglyph ones; the changes to the matroska-stereo_mode are due to this. The new STEREOMODE_STEREO3D_MAPPING has been put to good use for this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 02:26:13 +00:00
a7a220a77001e81685ec807ce5ac3bc6 *tests/data/fate/matroska-stereo_mode.matroska
1470764 tests/data/fate/matroska-stereo_mode.matroska
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
#extradata 0: 3510, 0x560c3919
#extradata 1: 3510, 0x560c3919
#extradata 2: 3510, 0x560c3919
#extradata 3: 3510, 0x560c3919
#extradata 4: 3510, 0x560c3919
#extradata 5: 3510, 0x560c3919
#extradata 6: 3510, 0x560c3919
#tb 0: 1/1000
#media_type 0: video
#codec_id 0: theora
#dimensions 0: 512x512
#sar 0: 0/1
#tb 1: 1/1000
#media_type 1: video
#codec_id 1: theora
#dimensions 1: 512x512
#sar 1: 1/1
#tb 2: 1/1000
#media_type 2: video
#codec_id 2: theora
#dimensions 2: 512x512
#sar 2: 1/1
#tb 3: 1/1000
#media_type 3: video
#codec_id 3: theora
#dimensions 3: 512x512
#sar 3: 3/1
#tb 4: 1/1000
#media_type 4: video
#codec_id 4: theora
#dimensions 4: 512x512
#sar 4: 455/256
#tb 5: 1/1000
#media_type 5: video
#codec_id 5: theora
#dimensions 5: 512x512
#sar 5: 16/9
#tb 6: 1/1000
#media_type 6: video
#codec_id 6: theora
#dimensions 6: 512x512
#sar 6: 2/1
0, 0, 0, 1000, 206173, 0x95af7455
fftools/ffmpeg: stop injecting stream side data in packets This is no longer needed as the side data is available for decoders in the AVCodecContext. The tests affected reflect the removal of useless CPB and Stereo 3D side data in packets. Signed-off-by: James Almer <jamrial@gmail.com>
2023-07-17 22:54:35 +00:00
1, 0, 0, 1000, 206173, 0x95af7455
2, 0, 0, 1000, 206173, 0x95af7455
3, 0, 0, 1000, 206173, 0x95af7455
4, 0, 0, 1000, 206173, 0x95af7455
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
5, 0, 0, 1000, 206173, 0x95af7455
6, 0, 0, 1000, 206173, 0x95af7455
0, 1000, 1000, 1000, 36, 0x34891010, F=0x0
1, 1000, 1000, 1000, 36, 0x34891010, F=0x0
2, 1000, 1000, 1000, 36, 0x34891010, F=0x0
3, 1000, 1000, 1000, 36, 0x34891010, F=0x0
4, 1000, 1000, 1000, 36, 0x34891010, F=0x0
5, 1000, 1000, 1000, 36, 0x34891010, F=0x0
6, 1000, 1000, 1000, 36, 0x34891010, F=0x0
0, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
1, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
2, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
3, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
4, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
5, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
6, 2000, 2000, 1000, 9, 0x17e5047e, F=0x0
0, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
1, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
2, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
3, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
4, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
5, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
6, 3000, 3000, 1000, 9, 0x17e5047e, F=0x0
0, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
1, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
2, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
3, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
4, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
5, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
6, 4000, 4000, 1000, 9, 0x17e5047e, F=0x0
0, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
1, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
2, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
3, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
4, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
5, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
6, 5000, 5000, 1000, 9, 0x17e5047e, F=0x0
0, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
1, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
2, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
3, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
4, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
5, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
6, 6000, 6000, 1000, 9, 0x17e5047e, F=0x0
0, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
1, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
2, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
3, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
4, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
5, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
6, 7000, 7000, 1000, 9, 0x17e5047e, F=0x0
0, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
1, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
2, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
3, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
4, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
5, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
6, 8000, 8000, 1000, 9, 0x17e5047e, F=0x0
0, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
1, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
2, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
3, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
4, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
5, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
6, 9000, 9000, 1000, 9, 0x17e5047e, F=0x0
[STREAM]
DISPOSITION:default=0
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=ger
TAG:DURATION=00:00:10.000000000
[/STREAM]
[STREAM]
DISPOSITION:default=0
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=ger-at
TAG:stereo_mode=left_right
TAG:DESCRIPTION-ger=Deutsch
fate/matroska: Stop using unicode in command line paramters The fate-run.sh shell script exports LC_ALL=C before invoking the test executables; this is probably done for consistency. When executing Windows binaries with Wine, it normally handles UTF-8 command line parameters just fine - but with LC_ALL set to C, it treats them as plain ASCII. As the unicode command line parameters wasn't the main thing being tested here, just convert them to plain ASCII, for portability. This fixes the test for all test configurations that use Wine. Signed-off-by: Martin Storsjö <martin@martin.st>
2023-08-21 20:08:25 +00:00
TAG:DESCRIPTION-fre=Francais
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
TAG:DURATION=00:00:10.000000000
[SIDE_DATA]
side_data_type=Stereo 3D
type=side by side
inverted=0
fftools/ffprobe: Print more Stereo 3D info from side data Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2024-05-30 18:55:53 +00:00
view=packed
primary_eye=none
ffprobe: always print all Stereo3D fields ffprobe is meant to generate parseable output, and if a field is present, it should be printed even if it has a default value. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 18:44:24 +00:00
baseline=0
avutil/stereo3d: set a sane default value for AVRational fields Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 19:20:24 +00:00
horizontal_disparity_adjustment=0/1
lavu/stereo3d: change the horizontal FOV field to a rational This avoids hardcoding any implementation-specific limitiations as part of the API, and allows for future expandability. This also allows API users to more conveniently convert the values into floats without hardcoding specific conversion constants. The API was committed a few days ago, so changing this field now is within the realms of acceptable.
2024-06-23 13:58:28 +00:00
horizontal_field_of_view=0/1
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
[/SIDE_DATA]
[/STREAM]
[STREAM]
DISPOSITION:default=0
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=eng
TAG:stereo_mode=bottom_top
TAG:DESCRIPTION-ger=Deutsch
fate/matroska: Stop using unicode in command line paramters The fate-run.sh shell script exports LC_ALL=C before invoking the test executables; this is probably done for consistency. When executing Windows binaries with Wine, it normally handles UTF-8 command line parameters just fine - but with LC_ALL set to C, it treats them as plain ASCII. As the unicode command line parameters wasn't the main thing being tested here, just convert them to plain ASCII, for portability. This fixes the test for all test configurations that use Wine. Signed-off-by: Martin Storsjö <martin@martin.st>
2023-08-21 20:08:25 +00:00
TAG:DESCRIPTION-fre=Francais
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
TAG:DURATION=00:00:10.000000000
[SIDE_DATA]
side_data_type=Stereo 3D
type=top and bottom
inverted=1
fftools/ffprobe: Print more Stereo 3D info from side data Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2024-05-30 18:55:53 +00:00
view=packed
primary_eye=none
ffprobe: always print all Stereo3D fields ffprobe is meant to generate parseable output, and if a field is present, it should be printed even if it has a default value. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 18:44:24 +00:00
baseline=0
avutil/stereo3d: set a sane default value for AVRational fields Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 19:20:24 +00:00
horizontal_disparity_adjustment=0/1
lavu/stereo3d: change the horizontal FOV field to a rational This avoids hardcoding any implementation-specific limitiations as part of the API, and allows for future expandability. This also allows API users to more conveniently convert the values into floats without hardcoding specific conversion constants. The API was committed a few days ago, so changing this field now is within the realms of acceptable.
2024-06-23 13:58:28 +00:00
horizontal_field_of_view=0/1
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
[/SIDE_DATA]
[/STREAM]
[STREAM]
DISPOSITION:default=1
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=deu-at
TAG:stereo_mode=row_interleaved_rl
TAG:DURATION=00:00:10.000000000
[SIDE_DATA]
side_data_type=Stereo 3D
type=interleaved lines
inverted=1
fftools/ffprobe: Print more Stereo 3D info from side data Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2024-05-30 18:55:53 +00:00
view=packed
primary_eye=none
ffprobe: always print all Stereo3D fields ffprobe is meant to generate parseable output, and if a field is present, it should be printed even if it has a default value. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 18:44:24 +00:00
baseline=0
avutil/stereo3d: set a sane default value for AVRational fields Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 19:20:24 +00:00
horizontal_disparity_adjustment=0/1
lavu/stereo3d: change the horizontal FOV field to a rational This avoids hardcoding any implementation-specific limitiations as part of the API, and allows for future expandability. This also allows API users to more conveniently convert the values into floats without hardcoding specific conversion constants. The API was committed a few days ago, so changing this field now is within the realms of acceptable.
2024-06-23 13:58:28 +00:00
horizontal_field_of_view=0/1
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
[/SIDE_DATA]
[/STREAM]
[STREAM]
DISPOSITION:default=0
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=fre
TAG:stereo_mode=col_interleaved_rl
fate/matroska: Stop using unicode in command line paramters The fate-run.sh shell script exports LC_ALL=C before invoking the test executables; this is probably done for consistency. When executing Windows binaries with Wine, it normally handles UTF-8 command line parameters just fine - but with LC_ALL set to C, it treats them as plain ASCII. As the unicode command line parameters wasn't the main thing being tested here, just convert them to plain ASCII, for portability. This fixes the test for all test configurations that use Wine. Signed-off-by: Martin Storsjö <martin@martin.st>
2023-08-21 20:08:25 +00:00
TAG:DESCRIPTION-DEU-AT=Oesterreichisch
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
TAG:DURATION=00:00:10.000000000
[SIDE_DATA]
side_data_type=Stereo 3D
type=interleaved columns
inverted=1
fftools/ffprobe: Print more Stereo 3D info from side data Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2024-05-30 18:55:53 +00:00
view=packed
primary_eye=none
ffprobe: always print all Stereo3D fields ffprobe is meant to generate parseable output, and if a field is present, it should be printed even if it has a default value. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 18:44:24 +00:00
baseline=0
avutil/stereo3d: set a sane default value for AVRational fields Prevent potential divisions by 0 when using them immediately after allocation. Signed-off-by: James Almer <jamrial@gmail.com>
2024-06-18 19:20:24 +00:00
horizontal_disparity_adjustment=0/1
lavu/stereo3d: change the horizontal FOV field to a rational This avoids hardcoding any implementation-specific limitiations as part of the API, and allows for future expandability. This also allows API users to more conveniently convert the values into floats without hardcoding specific conversion constants. The API was committed a few days ago, so changing this field now is within the realms of acceptable.
2024-06-23 13:58:28 +00:00
horizontal_field_of_view=0/1
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
[/SIDE_DATA]
[/STREAM]
[STREAM]
DISPOSITION:default=1
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=fra
avformat/matroskaenc: Don't add side-data to input stream When muxing, the AVStreams' side-data is typically set by the caller before avformat_write_header(); it is not documented to be else. Yet the Matroska muxer added an AVStereo3D side data if certain metadata was present: Since commit 4d686fb721b485ebbc4c7779d927d876c1e630f7 (adding support for AVStereo3D stream side-data), the Matroska muxer checked certain stream tags that contain Matroska's StereoMode and (if they are present) converted this value into an AVStereo3D struct that gets attached to the AVStream (reusing a function from the demuxer). Afterwards the AVStereo3D side data struct (whether it has just been added by the muxer or not) gets parsed and converted back into a Matroska StereoMode. Besides being an API violation this change broke StereoMode values without a corresponding AVStereo3D (namely the anaglyph ones). This commit fixes this: A StereoMode given via tags is now used-as-is; if no such tag exists and an AVStereo3D side data exists, it is converted into the corresponding StereoMode (if possible). This approach also fixes handling of the anaglyph ones; the changes to the matroska-stereo_mode are due to this. The new STEREOMODE_STEREO3D_MAPPING has been put to good use for this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 02:26:13 +00:00
TAG:stereo_mode=anaglyph_cyan_red
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
TAG:DURATION=00:00:10.000000000
[/STREAM]
[STREAM]
DISPOSITION:default=0
DISPOSITION:dub=0
DISPOSITION:original=0
TAG:language=de
avformat/matroskaenc: Don't add side-data to input stream When muxing, the AVStreams' side-data is typically set by the caller before avformat_write_header(); it is not documented to be else. Yet the Matroska muxer added an AVStereo3D side data if certain metadata was present: Since commit 4d686fb721b485ebbc4c7779d927d876c1e630f7 (adding support for AVStereo3D stream side-data), the Matroska muxer checked certain stream tags that contain Matroska's StereoMode and (if they are present) converted this value into an AVStereo3D struct that gets attached to the AVStream (reusing a function from the demuxer). Afterwards the AVStereo3D side data struct (whether it has just been added by the muxer or not) gets parsed and converted back into a Matroska StereoMode. Besides being an API violation this change broke StereoMode values without a corresponding AVStereo3D (namely the anaglyph ones). This commit fixes this: A StereoMode given via tags is now used-as-is; if no such tag exists and an AVStereo3D side data exists, it is converted into the corresponding StereoMode (if possible). This approach also fixes handling of the anaglyph ones; the changes to the matroska-stereo_mode are due to this. The new STEREOMODE_STEREO3D_MAPPING has been put to good use for this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 02:26:13 +00:00
TAG:stereo_mode=anaglyph_green_magenta
fate/matroska: Add test for stereo 3D Just mark a non-stereo file as stereo to test the code. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2023-08-11 22:48:09 +00:00
TAG:DESCRIPTION-ger=Deutsch
TAG:DURATION=00:00:10.000000000
[/STREAM]
Reference in New Issue Copy Permalink