From patchwork Fri Aug 30 02:17:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 2851734 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DE35C0AB5 for ; Fri, 30 Aug 2013 02:18:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3E7B2018B for ; Fri, 30 Aug 2013 02:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3116E201CD for ; Fri, 30 Aug 2013 02:18:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755382Ab3H3CRy (ORCPT ); Thu, 29 Aug 2013 22:17:54 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:37997 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755034Ab3H3CRx (ORCPT ); Thu, 29 Aug 2013 22:17:53 -0400 Received: by mail-pb0-f51.google.com with SMTP id jt11so1226978pbb.24 for ; Thu, 29 Aug 2013 19:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/xnWx6GRZxRLtpRjFC0rRgqTL5OxI+0O25YVMkRKPl0=; b=Kw287cRvUV/0d0lqC4ly6L1gfAJVVyj+5Sy2qO/XWUOz0/FGYE76N69+cfYad0Zsdy bS3uC0HYliytWl3WfcKzMWwnj3rZ2vDUrJ4lEnhTAjJL2LqhVfgUY3/oZugcEQapakyy PgpOWNq6amt3CJJmjZBZJCQmIEid0c/f5fSY4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/xnWx6GRZxRLtpRjFC0rRgqTL5OxI+0O25YVMkRKPl0=; b=V3lWIiL96krzmtyjWanTIfcEp9aRCaRfP58HOr+mzFqGdXR7mMrpnr8JwM5WpmTZQN CX87UH0ZnQOWpj+4ENZC0FUVtowAECDepGixGFSNYmF+3D9/lI4B3FfO+PSX4T7Yoev2 ae3LpSczrsUAQf2Z4ObRqie29PHeGoLSf1t/nbxAu/aU+qTx352GWNWTXlRlm9PoOuaY LDf2834jGCCsD9DMZixpE1QZQhf86lYN1qxThF0ytCGMVMm3G62N5D0ydmsWeWt/0xHp bxUmlZlKKPpXTlqpVO/Y6kW/lXpjpoYW67bJ8znHjKfywFIi7vRpeHhllzGfrGc/E9tT J7fQ== X-Gm-Message-State: ALoCoQkcbJtROroteUYc4S5Vnwueb2mCFPBYf2m07lw2pnUIFLTGST37LGKIE0Zs5EPW6cN1ZhHH X-Received: by 10.66.191.5 with SMTP id gu5mr7560580pac.126.1377829072875; Thu, 29 Aug 2013 19:17:52 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:52 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 15/19] uvcvideo: Add support for VP8 special frame flags. Date: Fri, 30 Aug 2013 11:17:14 +0900 Message-Id: <1377829038-4726-16-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Pawel Osciak --- drivers/media/usb/uvc/uvc_video.c | 18 +++++++++++++++++- drivers/media/usb/uvc/uvcvideo.h | 10 ++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 59f57a2..0291817 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1136,6 +1136,8 @@ static int uvc_video_parse_header(struct uvc_streaming *stream, if (header->has_scr) header->length += 6; + header->buf_flags = 0; + if (stream->cur_format->fcc == V4L2_PIX_FMT_VP8) { /* VP8 payload has 2 additional bytes of BFH. */ header->length += 2; @@ -1147,6 +1149,16 @@ static int uvc_video_parse_header(struct uvc_streaming *stream, header->has_sli = data[1] & UVC_STREAM_SLI; if (header->has_sli) header->length += 2; + + /* Codec-specific flags for v4l2_buffer. */ + header->buf_flags |= (data[1] & UVC_STREAM_STI) ? + V4L2_BUF_FLAG_KEYFRAME : 0; + header->buf_flags |= (data[2] & UVC_STREAM_VP8_PRF) ? + V4L2_BUF_FLAG_PREV_FRAME : 0; + header->buf_flags |= (data[2] & UVC_STREAM_VP8_ARF) ? + V4L2_BUF_FLAG_ALTREF_FRAME : 0; + header->buf_flags |= (data[2] & UVC_STREAM_VP8_GRF) ? + V4L2_BUF_FLAG_GOLDEN_FRAME : 0; } /* - bHeaderLength value can't be larger than the packet size. */ @@ -1222,6 +1234,8 @@ static void uvc_video_decode_isoc(struct urb *urb, struct uvc_streaming *stream) if (ret < 0) continue; + buf->buf.v4l2_buf.flags |= header.buf_flags; + /* Decode the payload data. */ uvc_video_decode_data(stream, buf, mem + header.length, urb->iso_frame_desc[i].actual_length - header.length); @@ -1293,8 +1307,10 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream) */ /* Process video data. */ - if (!stream->bulk.skip_payload && buf != NULL) + if (!stream->bulk.skip_payload && buf != NULL) { uvc_video_decode_data(stream, buf, mem, len); + buf->buf.v4l2_buf.flags |= header.buf_flags; + } /* Detect the payload end by a URB smaller than the maximum size (or * a payload size equal to the maximum) and process the header again. diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index b355b2c..fb21459 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -145,6 +145,14 @@ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 #define UVC_FMT_FLAG_STREAM 0x00000002 +/* v4l2_buffer codec flags */ +#define UVC_V4L2_BUFFER_CODEC_FLAGS (V4L2_BUF_FLAG_KEYFRAME | \ + V4L2_BUF_FLAG_PFRAME | \ + V4L2_BUF_FLAG_BFRAME | \ + V4L2_BUF_FLAG_PREV_FRAME | \ + V4L2_BUF_FLAG_GOLDEN_FRAME | \ + V4L2_BUF_FLAG_ALTREF_FRAME) + /* ------------------------------------------------------------------------ * Structures. */ @@ -472,6 +480,8 @@ struct uvc_payload_header { int length; int payload_size; + + __u32 buf_flags; /* v4l2_buffer flags */ }; struct uvc_streaming {