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.

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

Release 0.16.2 #32

Merged
merged 5 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
14 changes: 14 additions & 0 deletions ,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright 2024 feliks
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// https://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ It is a part of [Membrane Multimedia Framework](https://membrane.stream).
Add the following line to your `deps` in `mix.exs`. Run `mix deps.get`.

```elixir
{:membrane_ffmpeg_swscale_plugin, "~> 0.16.1"}
{:membrane_ffmpeg_swscale_plugin, "~> 0.16.2"}
```

The precompiled builds of the [ffmpeg](https://www.ffmpeg.org) will be pulled and linked automatically. However, should there be any problems, consider installing it manually.
Expand Down Expand Up @@ -41,13 +41,13 @@ pacman -S ffmpeg
## Description

### Converter
Converter accepts raw video in any of the pixel formats specified in type [`Membrane.RawVideo.pixel_format_t()`](https://hexdocs.pm/membrane_raw_video_format/Membrane.RawVideo.html#t:pixel_format_t/0).
Converter accepts raw video in any of the pixel formats specified in type [`Membrane.RawVideo.pixel_format()`](https://hexdocs.pm/membrane_raw_video_format/Membrane.RawVideo.html#t:pixel_format/0).
The element requires `Membrane.RawVideo` stream format on the input with `aligned: true` constraint, meaning that each buffer must contain exactly one raw video frame.

#### Converting pixel format

When creating the element you can specify a single option `format` defining the desired pixel format of the output.
`format` has to be [`Membrane.RawVideo.pixel_format_t()`](https://hexdocs.pm/membrane_raw_video_format/Membrane.RawVideo.html#t:pixel_format_t/0).
`format` has to be [`Membrane.RawVideo.pixel_format()`](https://hexdocs.pm/membrane_raw_video_format/Membrane.RawVideo.html#t:pixel_format/0).

#### Scaling

Expand Down
2 changes: 1 addition & 1 deletion lib/membrane_ffmpeg_swscale/converter.ex
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ defmodule Membrane.FFmpeg.SWScale.Converter do
"If true, native scaler will use shared memory (via `t:Shmex.t/0`) for storing frames"
],
format: [
spec: RawVideo.pixel_format_t() | nil,
spec: RawVideo.pixel_format() | nil,
default: nil,
description: """
Desired pixel format of output video.
Expand Down
4 changes: 2 additions & 2 deletions lib/membrane_ffmpeg_swscale/pixel_format_converter.ex
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defmodule Membrane.FFmpeg.SWScale.PixelFormatConverter do

@supported_pixel_formats [:I420, :I422, :I444, :RGB, :BGRA, :RGBA, :NV12, :NV21, :AYUV, :YUY2]

@spec supported_pixel_formats() :: [RawVideo.pixel_format_t()]
@spec supported_pixel_formats() :: [RawVideo.pixel_format()]
def supported_pixel_formats(), do: @supported_pixel_formats

def_input_pad :input,
Expand All @@ -27,7 +27,7 @@ defmodule Membrane.FFmpeg.SWScale.PixelFormatConverter do
when pixel_format in @supported_pixel_formats

def_options format: [
spec: RawVideo.pixel_format_t(),
spec: RawVideo.pixel_format(),
required?: true,
description: """
Desired pixel format of output video.
Expand Down
12 changes: 6 additions & 6 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Membrane.FFmpeg.SWScale.Mixfile do
use Mix.Project

@version "0.16.1"
@version "0.16.2"
@github_url "https://github.com/membraneframework/membrane_ffmpeg_swscale_plugin"

def project do
Expand Down Expand Up @@ -35,15 +35,15 @@ defmodule Membrane.FFmpeg.SWScale.Mixfile do
defp deps do
[
{:membrane_core, "~> 1.1"},
{:membrane_raw_video_format, "~> 0.3.0"},
{:membrane_raw_video_format, "~> 0.4.1"},
{:membrane_common_c, "~> 0.16.0"},
{:bundlex, "~> 1.2"},
{:membrane_precompiled_dependency_provider, "~> 0.1.0"},
# Testing
{:membrane_file_plugin, "~> 0.16.0", only: :test},
{:membrane_h264_plugin, "~> 0.9.0", only: :test},
{:membrane_h264_ffmpeg_plugin, "~> 0.31.0", only: :test},
{:membrane_raw_video_parser_plugin, "~> 0.12.0", only: :test},
{:membrane_file_plugin, "~> 0.17.0", only: :test},
{:membrane_h26x_plugin, "~> 0.10.2", only: :test},
{:membrane_h264_ffmpeg_plugin, "~> 0.32.4", only: :test},
{:membrane_raw_video_parser_plugin, "~> 0.12.2", only: :test},
{:ex_doc, "~> 0.28", only: :dev, runtime: false},
{:dialyxir, "~> 1.1", only: :dev, runtime: false},
{:credo, "~> 1.6", only: :dev, runtime: false}
Expand Down
Loading