Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
12b812d2
Commit
12b812d2
authored
Feb 28, 2012
by
Kostya Shishkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
prores: store and retrieve extended colourspace information
Based on the patch by Phil Barrett.
parent
c7084182
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
proresdec.c
libavcodec/proresdec.c
+4
-0
proresenc.c
libavcodec/proresenc.c
+3
-3
prores
tests/ref/vsynth1/prores
+1
-1
prores
tests/ref/vsynth2/prores
+1
-1
No files found.
libavcodec/proresdec.c
View file @
12b812d2
...
@@ -165,6 +165,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
...
@@ -165,6 +165,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
ctx
->
picture
.
top_field_first
=
ctx
->
frame_type
&
1
;
ctx
->
picture
.
top_field_first
=
ctx
->
frame_type
&
1
;
}
}
avctx
->
color_primaries
=
buf
[
14
];
avctx
->
color_trc
=
buf
[
15
];
avctx
->
colorspace
=
buf
[
16
];
ctx
->
alpha_info
=
buf
[
17
]
&
0xf
;
ctx
->
alpha_info
=
buf
[
17
]
&
0xf
;
if
(
ctx
->
alpha_info
)
if
(
ctx
->
alpha_info
)
av_log_missing_feature
(
avctx
,
"alpha channel"
,
0
);
av_log_missing_feature
(
avctx
,
"alpha channel"
,
0
);
...
...
libavcodec/proresenc.c
View file @
12b812d2
...
@@ -689,9 +689,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -689,9 +689,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_be16
(
&
buf
,
avctx
->
height
);
bytestream_put_be16
(
&
buf
,
avctx
->
height
);
bytestream_put_byte
(
&
buf
,
ctx
->
chroma_factor
<<
6
);
// frame flags
bytestream_put_byte
(
&
buf
,
ctx
->
chroma_factor
<<
6
);
// frame flags
bytestream_put_byte
(
&
buf
,
0
);
// reserved
bytestream_put_byte
(
&
buf
,
0
);
// reserved
bytestream_put_byte
(
&
buf
,
0
);
// primaries
bytestream_put_byte
(
&
buf
,
avctx
->
color_primaries
);
bytestream_put_byte
(
&
buf
,
0
);
// transfer function
bytestream_put_byte
(
&
buf
,
avctx
->
color_trc
);
bytestream_put_byte
(
&
buf
,
6
);
// colour matrix - ITU-R BT.601-4
bytestream_put_byte
(
&
buf
,
avctx
->
colorspace
);
bytestream_put_byte
(
&
buf
,
0x40
);
// source format and alpha information
bytestream_put_byte
(
&
buf
,
0x40
);
// source format and alpha information
bytestream_put_byte
(
&
buf
,
0
);
// reserved
bytestream_put_byte
(
&
buf
,
0
);
// reserved
bytestream_put_byte
(
&
buf
,
0x03
);
// matrix flags - both matrices are present
bytestream_put_byte
(
&
buf
,
0x03
);
// matrix flags - both matrices are present
...
...
tests/ref/vsynth1/prores
View file @
12b812d2
c050b1a4905175211ead9979562366ff
*./tests/data/vsynth1/prores.mov
2566517b15c62887bd94daaab1b1a85b
*./tests/data/vsynth1/prores.mov
3859037 ./tests/data/vsynth1/prores.mov
3859037 ./tests/data/vsynth1/prores.mov
0a4153637d0cc0a88a8bcbf04cfaf8c6 *./tests/data/prores.vsynth1.out.yuv
0a4153637d0cc0a88a8bcbf04cfaf8c6 *./tests/data/prores.vsynth1.out.yuv
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200
tests/ref/vsynth2/prores
View file @
12b812d2
ecd11fa69712902143c0c54b193c9313
*./tests/data/vsynth2/prores.mov
28755ce05e812adbb8b7c180318ffba8
*./tests/data/vsynth2/prores.mov
3884722 ./tests/data/vsynth2/prores.mov
3884722 ./tests/data/vsynth2/prores.mov
ca2f6c1162635dedfa468c90f1fdc0ef *./tests/data/prores.vsynth2.out.yuv
ca2f6c1162635dedfa468c90f1fdc0ef *./tests/data/prores.vsynth2.out.yuv
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment