Skip to content

Commit be1ad65

Browse files
committed
more cleanup
1 parent 5ce9157 commit be1ad65

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

lib/ex_webrtc/rtp/h264/depayloader.ex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ defmodule ExWebRTC.RTP.Depayloader.H264 do
3030
def depayload(depayloader, %ExRTP.Packet{payload: <<>>, padding: true}), do: {nil, depayloader}
3131

3232
def depayload(depayloader, packet) do
33-
with {:ok, {header, _payload} = nal} <- NAL.Header.parse_unit_header(packet.payload),
33+
with {:ok, {header, _payload} = nal} <- NAL.Header.parse(packet.payload),
3434
unit_type = NAL.Header.decode_type(header),
3535
{:ok, {nal, depayloader}} <-
3636
do_depayload(unit_type, depayloader, packet, nal) do
3737
{nal, depayloader}
3838
else
3939
{:error, reason} ->
40-
Logger.warning("""
40+
Logger.debug("""
4141
Couldn't parse payload, reason: #{reason}. \
4242
Resetting depayloader state. Payload: #{inspect(packet.payload)}.\
4343
""")
@@ -63,7 +63,7 @@ defmodule ExWebRTC.RTP.Depayloader.H264 do
6363
different than last start and without finishing the previous fu. dropping fu.\
6464
""")
6565

66-
{:error, "invalid timestamp inside fu-a"}
66+
{:error, :invalid_timestamp}
6767
end
6868

6969
defp do_depayload(
@@ -74,7 +74,7 @@ defmodule ExWebRTC.RTP.Depayloader.H264 do
7474
) do
7575
case FU.parse(payload, fu_parser_acc || []) do
7676
{:ok, {data, type}} ->
77-
data = NAL.Header.add_header(data, 0, header.nal_ref_idc, type)
77+
data = NAL.Header.add(data, 0, header.nal_ref_idc, type)
7878

7979
{:ok,
8080
{prefix_annexb(data),
@@ -90,7 +90,7 @@ defmodule ExWebRTC.RTP.Depayloader.H264 do
9090

9191
defp do_depayload(:stap_a, depayloader, packet, {_header, payload}) do
9292
with {:ok, result} <- StapA.parse(payload) do
93-
nals = result |> Stream.map(&prefix_annexb/1) |> Enum.join()
93+
nals = result |> Enum.map_join(&prefix_annexb/1)
9494
{:ok, {nals, %__MODULE__{depayloader | current_timestamp: packet.timestamp}}}
9595
end
9696
end
@@ -100,7 +100,7 @@ defmodule ExWebRTC.RTP.Depayloader.H264 do
100100
Received packet with unsupported NAL type: #{unsupported_type}. Supported types are: Single NALU, STAP-A, FU-A. Dropping packet.
101101
""")
102102

103-
{:error, "Unsupported nal type #{unsupported_type}"}
103+
{:error, :unsupported_nal_type}
104104
end
105105

106106
defp prefix_annexb(nal) do

lib/ex_webrtc/rtp/h264/nal_formats/fu.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defmodule ExWebRTC.RTP.H264.FU do
2-
@moduledoc """
3-
Module responsible for parsing H264 Fragmentation Unit.
4-
"""
2+
@moduledoc false
3+
# Module responsible for parsing H264 Fragmentation Unit.
4+
55
alias __MODULE__
66
alias ExWebRTC.RTP.H264.NAL
77

lib/ex_webrtc/rtp/h264/nal_header.ex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ defmodule ExWebRTC.RTP.H264.NAL.Header do
5656
type: rbsp_type()
5757
}
5858

59-
@spec parse_unit_header(binary()) :: {:error, :malformed_data} | {:ok, {t(), binary()}}
60-
def parse_unit_header(raw_nal)
59+
@spec parse(binary()) :: {:error, :malformed_data} | {:ok, {t(), binary()}}
60+
def parse(raw_nal)
6161

62-
def parse_unit_header(<<0::1, nri::2, type::5, rest::binary>>) do
62+
def parse(<<0::1, nri::2, type::5, rest::binary>>) do
6363
nal = %__MODULE__{
6464
nal_ref_idc: nri,
6565
type: type
@@ -69,13 +69,13 @@ defmodule ExWebRTC.RTP.H264.NAL.Header do
6969
end
7070

7171
# If first bit is not set to 0 packet is flagged as malformed
72-
def parse_unit_header(_binary), do: {:error, :malformed_data}
72+
def parse(_binary), do: {:error, :malformed_data}
7373

7474
@doc """
7575
Adds NAL header to payload
7676
"""
77-
@spec add_header(binary(), 0 | 1, nri(), rbsp_type()) :: binary()
78-
def add_header(payload, f, nri, type),
77+
@spec add(binary(), 0 | 1, nri(), rbsp_type()) :: binary()
78+
def add(payload, f, nri, type),
7979
do: <<f::1, nri::2, type::5>> <> payload
8080

8181
@doc """

0 commit comments

Comments
 (0)