Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OpenVisualCloud/Media-Transport-Library
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c772ed070fe672a9ce39a62c7742893c2129be1a
Choose a base ref
..
head repository: OpenVisualCloud/Media-Transport-Library
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 064f7b44175771bfd9e4de2ede476d5d8d61495d
Choose a head ref
Showing with 10 additions and 10 deletions.
  1. +5 −6 ecosystem/ffmpeg_plugin/mtl_st20p_rx.c
  2. +5 −4 ecosystem/ffmpeg_plugin/mtl_st20p_tx.c
11 changes: 5 additions & 6 deletions ecosystem/ffmpeg_plugin/mtl_st20p_rx.c
View file
Original file line number Diff line number Diff line change
@@ -17,12 +17,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "mtl_common.h"
#ifdef MTL_GPU_DIRECT_ENABLED
#include <mtl_gpu_direct/gpu.h>
#endif /* MTL_GPU_DIRECT_ENABLED */
#include <mtl/st_convert_api.h>

#include "mtl_common.h"

typedef struct MtlSt20pDemuxerContext {
const AVClass* class; /**< Class for private options. */

@@ -263,12 +264,10 @@ static int mtl_st20p_read_packet(AVFormatContext* ctx, AVPacket* pkt) {
}

if (s->pixel_format == AV_PIX_FMT_Y210LE) {
ret = st20_rfc4175_422be10_to_y210(
(struct st20_rfc4175_422_10_pg2_be*)frame, (uint16_t*)pkt->data,
s->width, s->height);
ret = st20_rfc4175_422be10_to_y210((struct st20_rfc4175_422_10_pg2_be*)frame,
(uint16_t*)pkt->data, s->width, s->height);
if (ret != 0) {
av_log(ctx, AV_LOG_ERROR,
"st20_rfc4175_422be10_to_y210le failed with %d\n", ret);
av_log(ctx, AV_LOG_ERROR, "st20_rfc4175_422be10_to_y210le failed with %d\n", ret);
return ret;
}
}
9 changes: 5 additions & 4 deletions ecosystem/ffmpeg_plugin/mtl_st20p_tx.c
View file
Original file line number Diff line number Diff line change
@@ -17,9 +17,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "mtl_common.h"
#include <mtl/st_convert_api.h>

#include "mtl_common.h"

typedef struct mtlSt20pMuxerContext {
const AVClass* class; /**< Class for private options. */

@@ -159,9 +160,9 @@ static int mtl_st20p_write_packet(AVFormatContext* ctx, AVPacket* pkt) {
dbg(ctx, "%s(%d), st20p_tx_get_frame: %p\n", __func__, s->idx, frame);

if (s->pixel_format == AV_PIX_FMT_Y210LE) {
st20_y210_to_rfc4175_422be10(
(uint16_t*)pkt->data, (struct st20_rfc4175_422_10_pg2_be*)(frame->addr[0]),
s->width, s->height);
st20_y210_to_rfc4175_422be10((uint16_t*)pkt->data,
(struct st20_rfc4175_422_10_pg2_be*)(frame->addr[0]),
s->width, s->height);
}

/* todo: zero copy with external frame mode */