mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-21 03:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use NV12 pixel format with VA-API

Browse source 
This gives better performance than yuv420p.

Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com>
This commit is contained in:
Park Ju Hyung 2020-11-09 20:28:49 +09:00
parent d9224e15d0
commit dbea82e362
5 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/decoder.c
View file

@ -1,6 +1,7 @@
#include "decoder.h"
#include <libavformat/avformat.h>
#include <libavutil/imgutils.h>
#include <libavutil/time.h>
#include <SDL2/SDL_events.h>
#include <SDL2/SDL_mutex.h>
@ -98,23 +99,29 @@ decoder_push(struct decoder *decoder, const AVPacket *packet) {
// the new decoding/encoding API has been introduced by:
// <http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=7fc329e2dd6226dfecaa4a1d7adf353bf2773726>
#ifdef SCRCPY_LAVF_HAS_NEW_ENCODING_DECODING_API
struct video_buffer *vb = decoder->video_buffer;
AVFrame *rendering_frame = vb->rendering_frame;
int ret;
if ((ret = avcodec_send_packet(decoder->codec_ctx, packet)) < 0) {
LOGE("Could not send video packet: %d", ret);
return false;
}
ret = avcodec_receive_frame(decoder->codec_ctx,
decoder->video_buffer->hw_frame);
vb->hw_frame);
if (!ret) {
// a frame was received
ret = av_hwframe_transfer_data(decoder->video_buffer->decoding_frame,
decoder->video_buffer->hw_frame, 0);
ret = av_hwframe_transfer_data(vb->decoding_frame,
vb->hw_frame, 0);
if (ret < 0) {
LOGE("Failed to transfer data to output frame: %d", ret);
goto fail;
}
av_image_fill_arrays(rendering_frame->data, rendering_frame->linesize,
vb->out_buffer, AV_PIX_FMT_NV12,
rendering_frame->width, rendering_frame->height, 1);
push_frame(decoder);
} else if (ret != AVERROR(EAGAIN)) {
goto fail;

2
app/src/scrcpy.c
View file

@ -361,7 +361,7 @@ scrcpy(const struct scrcpy_options *options) {
fps_counter_initialized = true;
if (!video_buffer_init(&video_buffer, &fps_counter,
options->render_expired_frames)) {
options->render_expired_frames, &frame_size)) {
goto end;
}
video_buffer_initialized = true;

8
app/src/screen.c
View file

@ -203,7 +203,7 @@ static inline SDL_Texture *
create_texture(struct screen *screen) {
SDL_Renderer *renderer = screen->renderer;
struct size size = screen->frame_size;
SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_YV12,
SDL_Texture *texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_NV12,
SDL_TEXTUREACCESS_STREAMING,
size.width, size.height);
if (!texture) {
@ -442,10 +442,8 @@ prepare_for_frame(struct screen *screen, struct size new_frame_size) {
// write the frame into the texture
static void
update_texture(struct screen *screen, const AVFrame *frame) {
SDL_UpdateYUVTexture(screen->texture, NULL,
frame->data[0], frame->linesize[0],
frame->data[1], frame->linesize[1],
frame->data[2], frame->linesize[2]);
SDL_UpdateTexture(screen->texture, NULL,
frame->data[0], frame->linesize[0]);
if (screen->mipmaps) {
assert(screen->use_opengl);

18
app/src/video_buffer.c
View file

@ -3,6 +3,7 @@
#include <assert.h>
#include <SDL2/SDL_mutex.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
#include <libavformat/avformat.h>
#include "config.h"
@ -11,7 +12,7 @@
bool
video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
bool render_expired_frames) {
bool render_expired_frames, struct size *size) {
vb->fps_counter = fps_counter;
if (!(vb->hw_frame = av_frame_alloc())) {
@ -21,21 +22,27 @@ video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
if (!(vb->decoding_frame = av_frame_alloc())) {
goto error_1;
}
vb->decoding_frame->format = AV_PIX_FMT_YUV420P;
vb->decoding_frame->format = AV_PIX_FMT_NV12;
if (!(vb->rendering_frame = av_frame_alloc())) {
goto error_2;
}
vb->rendering_frame->format = AV_PIX_FMT_NV12;
vb->out_buffer = av_malloc(av_image_get_buffer_size(AV_PIX_FMT_NV12, size->width, size->height, 1));
if (!vb->out_buffer) {
goto error_3;
}
if (!(vb->mutex = SDL_CreateMutex())) {
goto error_3;
goto error_4;
}
vb->render_expired_frames = render_expired_frames;
if (render_expired_frames) {
if (!(vb->rendering_frame_consumed_cond = SDL_CreateCond())) {
SDL_DestroyMutex(vb->mutex);
goto error_3;
goto error_4;
}
// interrupted is not used if expired frames are not rendered
// since offering a frame will never block
@ -48,6 +55,8 @@ video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
return true;
error_4:
av_free(vb->out_buffer);
error_3:
av_frame_free(&vb->rendering_frame);
error_2:
@ -64,6 +73,7 @@ video_buffer_destroy(struct video_buffer *vb) {
SDL_DestroyCond(vb->rendering_frame_consumed_cond);
}
SDL_DestroyMutex(vb->mutex);
av_free(vb->out_buffer);
av_frame_free(&vb->rendering_frame);
av_frame_free(&vb->decoding_frame);
av_frame_free(&vb->hw_frame);

4
app/src/video_buffer.h
View file

@ -5,6 +5,7 @@
#include <SDL2/SDL_mutex.h>
#include "config.h"
#include "common.h"
#include "fps_counter.h"
// forward declarations
@ -14,6 +15,7 @@ struct video_buffer {
AVFrame *hw_frame;
AVFrame *decoding_frame;
AVFrame *rendering_frame;
void *out_buffer;
SDL_mutex *mutex;
bool render_expired_frames;
bool interrupted;
@ -24,7 +26,7 @@ struct video_buffer {
bool
video_buffer_init(struct video_buffer *vb, struct fps_counter *fps_counter,
bool render_expired_frames);
bool render_expired_frames, struct size *size);
void
video_buffer_destroy(struct video_buffer *vb);