obj_context = CONTEXT(i965->current_context_id);
- if (!obj_context || obj_context->config_id == VA_INVALID_ID)
+ if (!obj_context)
return;
- obj_config = CONFIG(obj_context->config_id);
+ obj_config = obj_context->obj_config;
+ assert(obj_config);
if (!obj_config)
return;
*context = contextID;
obj_context->flags = flag;
obj_context->context_id = contextID;
- obj_context->config_id = config_id;
+ obj_context->obj_config = obj_config;
obj_context->picture_width = picture_width;
obj_context->picture_height = picture_height;
obj_context->num_render_targets = num_render_targets;
struct object_context *obj_context = CONTEXT(context);
struct object_surface *obj_surface = SURFACE(render_target);
struct object_config *obj_config;
- VAContextID config;
VAStatus vaStatus;
int i;
assert(obj_context);
+
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
assert(obj_surface);
- config = obj_context->config_id;
- obj_config = CONFIG(config);
+ if (!obj_surface)
+ return VA_STATUS_ERROR_INVALID_SURFACE;
+
+ obj_config = obj_context->obj_config;
assert(obj_config);
switch (obj_config->profile) {
struct object_context *obj_context = CONTEXT(context);
VAStatus vaStatus = VA_STATUS_SUCCESS;
int i;
+
+ assert(obj_context);
+
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
for (i = 0; i < num_buffers && vaStatus == VA_STATUS_SUCCESS; i++) {
struct object_buffer *obj_buffer = BUFFER(buffers[i]);
VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
int i;
+ assert(obj_context);
+
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
for (i = 0; i < num_buffers; i++) {
struct object_buffer *obj_buffer = BUFFER(buffers[i]);
assert(obj_buffer);
VAStatus vaStatus = VA_STATUS_SUCCESS;
int i;
+ assert(obj_context);
+
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
for (i = 0; i < num_buffers && vaStatus == VA_STATUS_SUCCESS; i++) {
struct object_buffer *obj_buffer = BUFFER(buffers[i]);
assert(obj_buffer);
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct object_context *obj_context;
struct object_config *obj_config;
- VAContextID config;
VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
obj_context = CONTEXT(context);
assert(obj_context);
- config = obj_context->config_id;
- obj_config = CONFIG(config);
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
+ obj_config = obj_context->obj_config;
assert(obj_config);
if (VAEntrypointVideoProc == obj_config->entrypoint) {
struct i965_driver_data *i965 = i965_driver_data(ctx);
struct object_context *obj_context = CONTEXT(context);
struct object_config *obj_config;
- VAContextID config;
assert(obj_context);
- config = obj_context->config_id;
- obj_config = CONFIG(config);
+
+ if (!obj_context)
+ return VA_STATUS_ERROR_INVALID_CONTEXT;
+
+ obj_config = obj_context->obj_config;
assert(obj_config);
if (obj_context->codec_type == CODEC_PROC) {