AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move SkYUVAIndex and SkImageSourceChannel to SkImageInfoPriv.h until used in public API

Browse Source 
Change-Id: Ib75be2b6e9eb9b80f1f9e738bc8e3300ddc08f22
Reviewed-on: https://skia-review.googlesource.com/129927
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Brian Salomon 2018-05-24 09:54:56 -04:00 committed by Skia Commit-Bot
parent 90f050387a
commit 75bf216c03
3 changed files with 36 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/SkImageInfo_Reference.bmh
View File

@ -1037,21 +1037,6 @@ with studio range of 16 to 235 range for components.
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
#Struct SkYUVAIndex
Describes which image source and which channel to read for each YUVA planes.
#Member int fIndex
Describes which image source to be reading from. The Alpha plane is optional and could be set to -1.
##
#Member SkImageSourceChannel fChannel
Describes which of the RGBA channel to read from.
##
#Struct SkYUVAIndex ##
# ------------------------------------------------------------------------------
#Struct SkImageInfo #Struct SkImageInfo

36
include/core/SkImageInfo.h
View File

@ -219,42 +219,6 @@ enum SkYUVColorSpace {
kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace, kLastEnum_SkYUVColorSpace = kRec709_SkYUVColorSpace,
}; };
/** \enum SkImageInfo::SkImageSourceChannel
Describes different channels we could read from image source.
*/
enum SkImageSourceChannel {
/** Describes the red channel; */
kR_SkImageSourceChannel,
/** Describes the green channel; */
kG_SkImageSourceChannel,
/** Describes the blue channel; */
kB_SkImageSourceChannel,
/** Describes the alpha channel; */
kA_SkImageSourceChannel,
/** Describes the alpha channel; */
kLastEnum_SkImageSourceChannel = kA_SkImageSourceChannel,
};
/** \struct SkYUVAIndex
Describes from which image source and which channel to read each individual YUVA plane.
SkYUVAIndex contains a index for which image source to read from and a enum for which channel
to read from.
*/
struct SK_API SkYUVAIndex {
/** The index is a number between -1..3 which definies which image source to read from, where -1
* means the image source doesn't exist. The assumption is we will always have image sources for
* each of YUV planes, but optionally have image source for A plane. */
int fIndex;
/** The channel describes from which channel to read the info from. Currently we only deal with
* YUV and NV12 and channel info is ignored. */
SkImageSourceChannel fChannel;
};
/** \struct SkImageInfo /** \struct SkImageInfo
Describes pixel dimensions and encoding. SkBitmap, SkImage, PixMap, and SkSurface Describes pixel dimensions and encoding. SkBitmap, SkImage, PixMap, and SkSurface
can be created from SkImageInfo. SkImageInfo can be retrieved from SkBitmap and can be created from SkImageInfo. SkImageInfo can be retrieved from SkBitmap and

36
src/core/SkImagePriv.h
View File

@ -83,4 +83,40 @@ void SkImage_unpinAsTexture(const SkImage*, GrContext*);
*/ */
sk_sp<SkImage> SkImageMakeRasterCopyAndAssignColorSpace(const SkImage*, SkColorSpace*); sk_sp<SkImage> SkImageMakeRasterCopyAndAssignColorSpace(const SkImage*, SkColorSpace*);
/** \enum SkImageInfo::SkImageSourceChannel
Describes different channels we could read from image source.
*/
enum SkImageSourceChannel {
/** Describes the red channel; */
kR_SkImageSourceChannel,
/** Describes the green channel; */
kG_SkImageSourceChannel,
/** Describes the blue channel; */
kB_SkImageSourceChannel,
/** Describes the alpha channel; */
kA_SkImageSourceChannel,
/** Describes the alpha channel; */
kLastEnum_SkImageSourceChannel = kA_SkImageSourceChannel,
};
/** \struct SkYUVAIndex
Describes from which image source and which channel to read each individual YUVA plane.
SkYUVAIndex contains a index for which image source to read from and a enum for which channel
to read from.
*/
struct SK_API SkYUVAIndex {
/** The index is a number between -1..3 which definies which image source to read from, where -1
* means the image source doesn't exist. The assumption is we will always have image sources for
* each of YUV planes, but optionally have image source for A plane. */
int fIndex;
/** The channel describes from which channel to read the info from. Currently we only deal with
* YUV and NV12 and channel info is ignored. */
SkImageSourceChannel fChannel;
};
#endif #endif