Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug with all the access units being considered a top_field #57

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Fix a bug with all the access units being considered a top_field #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/membrane_h264_plugin/h264/au_timestamp_generator.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ defmodule Membrane.H264.AUTimestampGenerator do

defp get_slice_type(vcl_nalu) do
case vcl_nalu.parsed_fields do
%{frame_mbs_only_flag: true} -> :frame
%{field_pic_flag: false} -> :frame
%{bottom_field_flag: true} -> :bottom_field
%{frame_mbs_only_flag: 1} -> :frame
%{field_pic_flag: 0} -> :frame
%{bottom_field_flag: 1} -> :bottom_field
_other -> :top_field
end
end
Expand Down
2 changes: 2 additions & 0 deletions lib/membrane_h264_plugin/h264/nalu_parser/schemes/pps.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ defmodule Membrane.H264.NALuParser.Schemes.PPS do
do: [
field: {:pic_parameter_set_id, :ue},
field: {:seq_parameter_set_id, :ue},
field: {:entropy_coding_mode_flag, :u1},
field: {:bottom_field_pic_order_in_frame_present_flag, :u1},
save_state_as_global_state: {&{:pps, &1}, [:pic_parameter_set_id]}
]
end
19 changes: 15 additions & 4 deletions lib/membrane_h264_plugin/h264/nalu_parser/schemes/slice.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule Membrane.H264.NALuParser.Schemes.Slice do
@behaviour Membrane.H26x.NALuParser.Scheme

@impl true
def defaults(), do: []
def defaults(), do: [field_pic_flag: 0, delta_pic_order_cnt_bottom: 0]

# If we're ever unlucky and have to parse more fields from the slice header
# this implementation may come in handy:
Expand All @@ -14,7 +14,7 @@ defmodule Membrane.H264.NALuParser.Schemes.Slice do
field: {:first_mb_in_slice, :ue},
field: {:slice_type, :ue},
field: {:pic_parameter_set_id, :ue},
execute: &load_data_from_sps(&1, &2, &3),
execute: &load_data_from_sps_and_pps(&1, &2, &3),
if: {{&(&1 == 1), [:separate_colour_plane_flag]}, field: {:colour_plane_id, :u2}},
field: {:frame_num, {:uv, &(&1 + 4), [:log2_max_frame_num_minus4]}},
if:
Expand All @@ -24,10 +24,15 @@ defmodule Membrane.H264.NALuParser.Schemes.Slice do
if: {{&(&1 == 5), [:nal_unit_type]}, field: {:idr_pic_id, :ue}},
if:
{{&(&1 == 0), [:pic_order_cnt_type]},
field: {:pic_order_cnt_lsb, {:uv, &(&1 + 4), [:log2_max_pic_order_cnt_lsb_minus4]}}}
field: {:pic_order_cnt_lsb, {:uv, &(&1 + 4), [:log2_max_pic_order_cnt_lsb_minus4]}},
if:
{{fn delta_pic_order_cnt_bottom, field_pic_flag ->
delta_pic_order_cnt_bottom == 1 and field_pic_flag == 0
end, [:bottom_field_pic_order_in_frame_present_flag, :field_pic_flag]},
field: {:pic_order_cnt_lsb, :se}}}
]

defp load_data_from_sps(payload, state, _iterators) do
defp load_data_from_sps_and_pps(payload, state, _iterators) do
with pic_parameter_set_id when pic_parameter_set_id != nil <-
Map.get(state.__local__, :pic_parameter_set_id),
pps when pps != nil <- Map.get(state.__global__, {:pps, pic_parameter_set_id}),
Expand All @@ -49,7 +54,13 @@ defmodule Membrane.H264.NALuParser.Schemes.Slice do
:log2_max_pic_order_cnt_lsb_minus4
])

pps_fields =
Map.take(pps, [
:bottom_field_pic_order_in_frame_present_flag
])

state = Map.update(state, :__local__, %{}, &Map.merge(&1, sps_fields))
state = Map.update(state, :__local__, %{}, &Map.merge(&1, pps_fields))

{payload, state}
else
Expand Down
Loading