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
e4334971
Commit
e4334971
authored
Jul 24, 2017
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avdevice/decklink_dec: set field order via codecpar
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
8b2cd8e0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
decklink_dec.cpp
libavdevice/decklink_dec.cpp
+13
-7
No files found.
libavdevice/decklink_dec.cpp
View file @
e4334971
...
...
@@ -731,6 +731,19 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
st
->
codecpar
->
bit_rate
=
av_rescale
(
ctx
->
bmd_width
*
ctx
->
bmd_height
*
16
,
st
->
time_base
.
den
,
st
->
time_base
.
num
);
}
switch
(
ctx
->
bmd_field_dominance
)
{
case
bmdUpperFieldFirst
:
st
->
codecpar
->
field_order
=
AV_FIELD_TT
;
break
;
case
bmdLowerFieldFirst
:
st
->
codecpar
->
field_order
=
AV_FIELD_BB
;
break
;
case
bmdProgressiveFrame
:
case
bmdProgressiveSegmentedFrame
:
st
->
codecpar
->
field_order
=
AV_FIELD_PROGRESSIVE
;
break
;
}
avpriv_set_pts_info
(
st
,
64
,
1
,
1000000
);
/* 64 bits pts in us */
ctx
->
video_st
=
st
;
...
...
@@ -788,15 +801,8 @@ int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt)
{
struct
decklink_cctx
*
cctx
=
(
struct
decklink_cctx
*
)
avctx
->
priv_data
;
struct
decklink_ctx
*
ctx
=
(
struct
decklink_ctx
*
)
cctx
->
ctx
;
AVFrame
*
frame
=
ctx
->
video_st
->
codec
->
coded_frame
;
avpacket_queue_get
(
&
ctx
->
queue
,
pkt
,
1
);
if
(
frame
&&
(
ctx
->
bmd_field_dominance
==
bmdUpperFieldFirst
||
ctx
->
bmd_field_dominance
==
bmdLowerFieldFirst
))
{
frame
->
interlaced_frame
=
1
;
if
(
ctx
->
bmd_field_dominance
==
bmdUpperFieldFirst
)
{
frame
->
top_field_first
=
1
;
}
}
return
0
;
}
...
...
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