projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iris: Implement pipe_screen::resource_get_param
[mesa.git]
/
src
/
gallium
/
drivers
/
radeon
/
radeon_vce_40_2_2.c
diff --git
a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
index f1db47d4bd1512a83b61187fda2ebd120dfb11df..e17468c9097b693bd7ba7af0dec85505b96de162 100644
(file)
--- a/
src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/
src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@
-34,12
+34,10
@@
#include "vl/vl_video_buffer.h"
#include "vl/vl_video_buffer.h"
-#include "
r600_pipe_common
.h"
+#include "
si_pipe
.h"
#include "radeon_video.h"
#include "radeon_vce.h"
#include "radeon_video.h"
#include "radeon_vce.h"
-static const unsigned profiles[7] = { 66, 77, 88, 100, 110, 122, 244 };
-
static void session(struct rvce_encoder *enc)
{
RVCE_BEGIN(0x00000001); // session cmd
static void session(struct rvce_encoder *enc)
{
RVCE_BEGIN(0x00000001); // session cmd
@@
-82,8
+80,7
@@
static void create(struct rvce_encoder *enc)
RVCE_BEGIN(0x01000001); // create cmd
RVCE_CS(0x00000000); // encUseCircularBuffer
RVCE_BEGIN(0x01000001); // create cmd
RVCE_CS(0x00000000); // encUseCircularBuffer
- RVCE_CS(profiles[enc->base.profile -
- PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE]); // encProfile
+ RVCE_CS(u_get_h264_profile_idc(enc->base.profile)); // encProfile
RVCE_CS(enc->base.level); // encLevel
RVCE_CS(0x00000000); // encPicStructRestriction
RVCE_CS(enc->base.width); // encImageWidth
RVCE_CS(enc->base.level); // encLevel
RVCE_CS(0x00000000); // encPicStructRestriction
RVCE_CS(enc->base.width); // encImageWidth
@@
-421,6
+418,8
@@
static void destroy(struct rvce_encoder *enc)
{
enc->task_info(enc, 0x00000001, 0, 0, 0);
{
enc->task_info(enc, 0x00000001, 0, 0, 0);
+ feedback(enc);
+
RVCE_BEGIN(0x02000001); // destroy
RVCE_END();
}
RVCE_BEGIN(0x02000001); // destroy
RVCE_END();
}